Execute the 'git ...' rather than 'git-...'

Since many commands are now built into the git binary, it doesn't make
sense to run the git-... scripts. The patch modifies the GRun class to
pass the 'git' file name together with the command arguments. It also
modifies all the other calls to git-...

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/basedir.py b/stgit/basedir.py
index 30f45f971fcd75ab618dcba4cde538b86dbb3f89..3e078f51b29d95baf3793f203086d3ec5fd8be1e 100644 (file)
--- a/stgit/basedir.py
+++ b/stgit/basedir.py
@@ -34,7 +34,7 @@ def get():
             __base_dir = os.environ['GIT_DIR']
         else:
             try:
-                __base_dir = Run('git-rev-parse', '--git-dir').output_one_line()
+                __base_dir = Run('git', 'rev-parse', '--git-dir').output_one_line()
             except RunException:
                 __base_dir = ''
 

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 2672dcfe34c2b601c1814a106be79ed9a70cff49..6318cdde497751c918dc5dbd18fc9b9fddd5982a 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -500,14 +500,14 @@ class _Directory(object):
     @readonly_constant_property
     def git_dir(self):
         try:
-            return Run('git-rev-parse', '--git-dir'
+            return Run('git', 'rev-parse', '--git-dir'
                        ).discard_stderr().output_one_line()
         except RunException:
             raise DirectoryException('No git repository found')
     @readonly_constant_property
     def __topdir_path(self):
         try:
-            lines = Run('git-rev-parse', '--show-cdup'
+            lines = Run('git', 'rev-parse', '--show-cdup'
                         ).discard_stderr().output_lines()
             if len(lines) == 0:
                 return '.'
@@ -520,12 +520,12 @@ class _Directory(object):
     @readonly_constant_property
     def is_inside_git_dir(self):
         return { 'true': True, 'false': False
-                 }[Run('git-rev-parse', '--is-inside-git-dir'
+                 }[Run('git', 'rev-parse', '--is-inside-git-dir'
                        ).output_one_line()]
     @readonly_constant_property
     def is_inside_worktree(self):
         return { 'true': True, 'false': False
-                 }[Run('git-rev-parse', '--is-inside-work-tree'
+                 }[Run('git', 'rev-parse', '--is-inside-work-tree'
                        ).output_one_line()]
     def cd_to_topdir(self):
         os.chdir(self.__topdir_path)

diff --git a/stgit/commands/repair.py b/stgit/commands/repair.py
index 4787f72a7783a8cf5699dc902738c7b97cfdbe6a..c36db07f2ebcc4dde795095b62f2278a6fd5e0a6 100644 (file)
--- a/stgit/commands/repair.py
+++ b/stgit/commands/repair.py
@@ -80,7 +80,7 @@ def read_commit_dag(branch):
     out.start('Reading commit DAG')
     commits = {}
     patches = set()
-    for line in Run('git-rev-list', '--parents', '--all').output_lines():
+    for line in Run('git', 'rev-list', '--parents', '--all').output_lines():
         cs = line.split()
         for id in cs:
             if not id in commits:
@@ -88,7 +88,7 @@ def read_commit_dag(branch):
         for id in cs[1:]:
             commits[cs[0]].parents.add(commits[id])
             commits[id].children.add(commits[cs[0]])
-    for line in Run('git-show-ref').output_lines():
+    for line in Run('git', 'show-ref').output_lines():
         id, ref = line.split()
         m = re.match(r'^refs/patches/%s/(.+)$' % branch, ref)
         if m and not m.group(1).endswith('.log'):

diff --git a/stgit/config.py b/stgit/config.py
index 3eabc8c3a3abef4be9586d933ff573efe0dd7e17..61f91b06730051fa96dde3956d83153a4d868983 100644 (file)
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -31,8 +31,8 @@ class GitConfig:
         'stgit.autoresolved':  'no',
         'stgit.smtpserver':    'localhost:25',
         'stgit.smtpdelay':     '5',
-        'stgit.pullcmd':       'git-pull',
-        'stgit.fetchcmd':      'git-fetch',
+        'stgit.pullcmd':       'git pull',
+        'stgit.fetchcmd':      'git fetch',
         'stgit.pull-policy':   'pull',
         'stgit.merger':                'diff3 -L current -L ancestor -L patched -m -E ' \
                                '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"',
@@ -49,7 +49,7 @@ class GitConfig:
         if self.__cache.has_key(name):
             return self.__cache[name]
         try:
-            value = Run('git-repo-config', '--get', name).output_one_line()
+            value = Run('git', 'repo-config', '--get', name).output_one_line()
         except RunException:
             value = self.__defaults.get(name, None)
         self.__cache[name] = value
@@ -58,7 +58,7 @@ class GitConfig:
     def getall(self, name):
         if self.__cache.has_key(name):
             return self.__cache[name]
-        values = Run('git-repo-config', '--get-all', name
+        values = Run('git', 'repo-config', '--get-all', name
                      ).returns([0, 1]).output_lines()
         self.__cache[name] = values
         return values
@@ -73,23 +73,23 @@ class GitConfig:
     def rename_section(self, from_name, to_name):
         """Rename a section in the config file. Silently do nothing if
         the section doesn't exist."""
-        Run('git-repo-config', '--rename-section', from_name, to_name
+        Run('git', 'repo-config', '--rename-section', from_name, to_name
             ).returns([0, 1]).run()
         self.__cache.clear()
 
     def remove_section(self, name):
         """Remove a section in the config file. Silently do nothing if
         the section doesn't exist."""
-        Run('git-repo-config', '--remove-section', name
+        Run('git', 'repo-config', '--remove-section', name
             ).returns([0, 1]).discard_stderr().discard_output()
         self.__cache.clear()
 
     def set(self, name, value):
-        Run('git-repo-config', name, value).run()
+        Run('git', 'repo-config', name, value).run()
         self.__cache[name] = value
 
     def unset(self, name):
-        Run('git-repo-config', '--unset', name)
+        Run('git', 'repo-config', '--unset', name)
         self.__cache[name] = None
 
     def sections_matching(self, regexp):
@@ -98,7 +98,7 @@ class GitConfig:
         group contents, for all variable names matching the regexp.
         """
         result = []
-        for line in Run('git-repo-config', '--get-regexp', '"^%s$"' % regexp
+        for line in Run('git', 'repo-config', '--get-regexp', '"^%s$"' % regexp
                         ).returns([0, 1]).output_lines():
             m = re.match('^%s ' % regexp, line)
             if m:

diff --git a/stgit/git.py b/stgit/git.py
index d0eef84355cbc32a336bb67934a8ea9b1c0f5280..b5551ded0aba040a7a7e83d3c5878e0314da42f6 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -38,6 +38,10 @@ class GitRunException(GitException):
     pass
 class GRun(Run):
     exc = GitRunException
+    def __init__(self, *cmd):
+        """Initialise the Run object and insert the 'git' command name.
+        """
+        Run.__init__(self, 'git', *cmd)
 
 
 #
@@ -82,7 +86,7 @@ class Commit:
     def __init__(self, id_hash):
         self.__id_hash = id_hash
 
-        lines = GRun('git-cat-file', 'commit', id_hash).output_lines()
+        lines = GRun('cat-file', 'commit', id_hash).output_lines()
         for i in range(len(lines)):
             line = lines[i]
             if not line:
@@ -112,7 +116,7 @@ class Commit:
             return None
 
     def get_parents(self):
-        return GRun('git-rev-list', '--parents', '--max-count=1', self.__id_hash
+        return GRun('rev-list', '--parents', '--max-count=1', self.__id_hash
                     ).output_one_line().split()[1:]
 
     def get_author(self):
@@ -181,9 +185,9 @@ def ls_files(files, tree = None, full_name = True):
     args.append('--')
     args.extend(files)
     try:
-        return GRun('git-ls-files', '--error-unmatch', *args).output_lines()
+        return GRun('ls-files', '--error-unmatch', *args).output_lines()
     except GitRunException:
-        # just hide the details of the git-ls-files command we use
+        # just hide the details of the 'git ls-files' command we use
         raise GitException, \
             'Some of the given paths are either missing or not known to GIT'
 
@@ -207,7 +211,7 @@ def tree_status(files = None, tree_id = 'HEAD', unknown = False,
 
     # unknown files
     if unknown:
-        cmd = ['git-ls-files', '-z', '--others', '--directory',
+        cmd = ['ls-files', '-z', '--others', '--directory',
                '--no-empty-directory']
         if not noexclude:
             cmd += ['--exclude=%s' % s for s in
@@ -231,7 +235,7 @@ def tree_status(files = None, tree_id = 'HEAD', unknown = False,
     args = diff_flags + [tree_id]
     if files:
         args += ['--'] + files
-    for line in GRun('git-diff-index', *args).output_lines():
+    for line in GRun('diff-index', *args).output_lines():
         fs = tuple(line.rstrip().split(' ',4)[-1].split('\t',1))
         if fs[1] not in conflicts:
             cache_files.append(fs)
@@ -249,7 +253,7 @@ def local_changes(verbose = True):
 def get_heads():
     heads = []
     hr = re.compile(r'^[0-9a-f]{40} refs/heads/(.+)$')
-    for line in GRun('git-show-ref', '--heads').output_lines():
+    for line in GRun('show-ref', '--heads').output_lines():
         m = hr.match(line)
         heads.append(m.group(1))
     return heads
@@ -275,7 +279,7 @@ def get_head_file():
     Throw an exception if HEAD is detached."""
     try:
         return strip_prefix(
-            'refs/heads/', GRun('git-symbolic-ref', '-q', 'HEAD'
+            'refs/heads/', GRun('symbolic-ref', '-q', 'HEAD'
                                 ).output_one_line())
     except GitRunException:
         raise DetachedHeadException()
@@ -287,14 +291,14 @@ def set_head_file(ref):
     # in the new head
     __clear_head_cache()
     try:
-        GRun('git-symbolic-ref', 'HEAD', 'refs/heads/%s' % ref).run()
+        GRun('symbolic-ref', 'HEAD', 'refs/heads/%s' % ref).run()
     except GitRunException:
         raise GitException, 'Could not set head to "%s"' % ref
 
 def set_ref(ref, val):
     """Point ref at a new commit object."""
     try:
-        GRun('git-update-ref', ref, val).run()
+        GRun('update-ref', ref, val).run()
     except GitRunException:
         raise GitException, 'Could not update %s to "%s".' % (ref, val)
 
@@ -323,13 +327,13 @@ def __clear_head_cache():
 def refresh_index():
     """Refresh index with stat() information from the working directory.
     """
-    GRun('git-update-index', '-q', '--unmerged', '--refresh').run()
+    GRun('update-index', '-q', '--unmerged', '--refresh').run()
 
 def rev_parse(git_id):
     """Parse the string and return a verified SHA1 id
     """
     try:
-        return GRun('git-rev-parse', '--verify', git_id
+        return GRun('rev-parse', '--verify', git_id
                     ).discard_stderr().output_one_line()
     except GitRunException:
         raise GitException, 'Unknown revision: %s' % git_id
@@ -373,9 +377,9 @@ def switch_branch(new_branch):
     if tree_id != get_head():
         refresh_index()
         try:
-            GRun('git-read-tree', '-u', '-m', get_head(), tree_id).run()
+            GRun('read-tree', '-u', '-m', get_head(), tree_id).run()
         except GitRunException:
-            raise GitException, 'git-read-tree failed (local changes maybe?)'
+            raise GitException, 'read-tree failed (local changes maybe?)'
         __head = tree_id
     set_head_file(new_branch)
 
@@ -385,9 +389,9 @@ def switch_branch(new_branch):
 def delete_ref(ref):
     if not ref_exists(ref):
         raise GitException, '%s does not exist' % ref
-    sha1 = GRun('git-show-ref', '-s', ref).output_one_line()
+    sha1 = GRun('show-ref', '-s', ref).output_one_line()
     try:
-        GRun('git-update-ref', '-d', ref, sha1).run()
+        GRun('update-ref', '-d', ref, sha1).run()
     except GitRunException:
         raise GitException, 'Failed to delete ref %s' % ref
 
@@ -400,13 +404,13 @@ def rename_ref(from_ref, to_ref):
     if ref_exists(to_ref):
         raise GitException, '"%s" already exists' % to_ref
 
-    sha1 = GRun('git-show-ref', '-s', from_ref).output_one_line()
+    sha1 = GRun('show-ref', '-s', from_ref).output_one_line()
     try:
-        GRun('git-update-ref', to_ref, sha1, '0'*40).run()
+        GRun('update-ref', to_ref, sha1, '0'*40).run()
     except GitRunException:
         raise GitException, 'Failed to create new ref %s' % to_ref
     try:
-        GRun('git-update-ref', '-d', from_ref, sha1).run()
+        GRun('update-ref', '-d', from_ref, sha1).run()
     except GitRunException:
         raise GitException, 'Failed to delete ref %s' % from_ref
 
@@ -445,7 +449,7 @@ def add(names):
 
     if files:
         try:
-            GRun('git-update-index', '--add', '--').xargs(files)
+            GRun('update-index', '--add', '--').xargs(files)
         except GitRunException:
             raise GitException, 'Unable to add file'
 
@@ -453,7 +457,7 @@ def __copy_single(source, target, target2=''):
     """Copy file or dir named 'source' to name target+target2"""
 
     # "source" (file or dir) must match one or more git-controlled file
-    realfiles = GRun('git-ls-files', source).output_lines()
+    realfiles = GRun('ls-files', source).output_lines()
     if len(realfiles) == 0:
         raise GitException, '"%s" matches no git-controled files' % source
 
@@ -521,10 +525,10 @@ def rm(files, force = False):
             if os.path.exists(f):
                 raise GitException, '%s exists. Remove it first' %f
         if files:
-            GRun('git-update-index', '--remove', '--').xargs(files)
+            GRun('update-index', '--remove', '--').xargs(files)
     else:
         if files:
-            GRun('git-update-index', '--force-remove', '--').xargs(files)
+            GRun('update-index', '--force-remove', '--').xargs(files)
 
 # Persons caching
 __user = None
@@ -596,9 +600,9 @@ def update_cache(files = None, force = False):
     rm_files =  [x[1] for x in cache_files if x[0] in ['D']]
     m_files =   [x[1] for x in cache_files if x[0] in ['M']]
 
-    GRun('git-update-index', '--add', '--').xargs(add_files)
-    GRun('git-update-index', '--force-remove', '--').xargs(rm_files)
-    GRun('git-update-index', '--').xargs(m_files)
+    GRun('update-index', '--add', '--').xargs(add_files)
+    GRun('update-index', '--force-remove', '--').xargs(rm_files)
+    GRun('update-index', '--').xargs(m_files)
 
     return True
 
@@ -625,7 +629,7 @@ def commit(message, files = None, parents = None, allowempty = False,
 
     # write the index to repository
     if tree_id == None:
-        tree_id = GRun('git-write-tree').output_one_line()
+        tree_id = GRun('write-tree').output_one_line()
         set_head = True
 
     # the commit
@@ -640,7 +644,7 @@ def commit(message, files = None, parents = None, allowempty = False,
         env['GIT_COMMITTER_NAME'] = committer_name
     if committer_email:
         env['GIT_COMMITTER_EMAIL'] = committer_email
-    commit_id = GRun('git-commit-tree', tree_id,
+    commit_id = GRun('commit-tree', tree_id,
                      *sum([['-p', p] for p in parents], [])
                      ).env(env).raw_input(message).output_one_line()
     if set_head:
@@ -665,7 +669,7 @@ def apply_diff(rev1, rev2, check_index = True, files = None):
     diff_str = diff(files, rev1, rev2)
     if diff_str:
         try:
-            GRun('git-apply', *index_opt).raw_input(
+            GRun('apply', *index_opt).raw_input(
                 diff_str).discard_stderr().no_output()
         except GitRunException:
             return False
@@ -684,7 +688,7 @@ def merge(base, head1, head2, recursive = False):
         # general when pushing or picking patches)
         try:
             # discard output to mask the verbose prints of the tool
-            GRun('git-merge-recursive', base, '--', head1, head2
+            GRun('merge-recursive', base, '--', head1, head2
                  ).discard_output()
         except GitRunException, ex:
             err_output = str(ex)
@@ -694,16 +698,16 @@ def merge(base, head1, head2, recursive = False):
         # distance between base and heads is small, i.e. folding or
         # synchronising patches)
         try:
-            GRun('git-read-tree', '-u', '-m', '--aggressive',
+            GRun('read-tree', '-u', '-m', '--aggressive',
                  base, head1, head2).run()
         except GitRunException:
-            raise GitException, 'git-read-tree failed (local changes maybe?)'
+            raise GitException, 'read-tree failed (local changes maybe?)'
 
     # check the index for unmerged entries
     files = {}
     stages_re = re.compile('^([0-7]+) ([0-9a-f]{40}) ([1-3])\t(.*)$', re.S)
 
-    for line in GRun('git-ls-files', '--unmerged', '--stage', '-z'
+    for line in GRun('ls-files', '--unmerged', '--stage', '-z'
                      ).raw_output().split('\0'):
         if not line:
             continue
@@ -751,15 +755,15 @@ def diff(files = None, rev1 = 'HEAD', rev2 = None, diff_flags = []):
         files = []
 
     if rev1 and rev2:
-        return GRun('git-diff-tree', '-p',
+        return GRun('diff-tree', '-p',
                     *(diff_flags + [rev1, rev2, '--'] + files)).raw_output()
     elif rev1 or rev2:
         refresh_index()
         if rev2:
-            return GRun('git-diff-index', '-p', '-R',
+            return GRun('diff-index', '-p', '-R',
                         *(diff_flags + [rev2, '--'] + files)).raw_output()
         else:
-            return GRun('git-diff-index', '-p',
+            return GRun('diff-index', '-p',
                         *(diff_flags + [rev1, '--'] + files)).raw_output()
     else:
         return ''
@@ -768,7 +772,7 @@ def diff(files = None, rev1 = 'HEAD', rev2 = None, diff_flags = []):
 # usually invoke git.diff() form the calling functions
 def diffstat(files = None, rev1 = 'HEAD', rev2 = None):
     """Return the diffstat between rev1 and rev2."""
-    return GRun('git-apply', '--stat', '--summary'
+    return GRun('apply', '--stat', '--summary'
                 ).raw_input(diff(files, rev1, rev2)).raw_output()
 
 def files(rev1, rev2, diff_flags = []):
@@ -776,7 +780,7 @@ def files(rev1, rev2, diff_flags = []):
     """
 
     result = []
-    for line in GRun('git-diff-tree', *(diff_flags + ['-r', rev1, rev2])
+    for line in GRun('diff-tree', *(diff_flags + ['-r', rev1, rev2])
                      ).output_lines():
         result.append('%s %s' % tuple(line.split(' ', 4)[-1].split('\t', 1)))
 
@@ -787,7 +791,7 @@ def barefiles(rev1, rev2):
     """
 
     result = []
-    for line in GRun('git-diff-tree', '-r', rev1, rev2).output_lines():
+    for line in GRun('diff-tree', '-r', rev1, rev2).output_lines():
         result.append(line.split(' ', 4)[-1].split('\t', 1)[-1])
 
     return '\n'.join(result)
@@ -795,7 +799,7 @@ def barefiles(rev1, rev2):
 def pretty_commit(commit_id = 'HEAD', diff_flags = []):
     """Return a given commit (log + diff)
     """
-    return GRun('git-diff-tree',
+    return GRun('diff-tree',
                 *(diff_flags
                   + ['--cc', '--always', '--pretty', '-r', commit_id])
                 ).raw_output()
@@ -805,11 +809,11 @@ def checkout(files = None, tree_id = None, force = False):
     """
     if tree_id:
         try:
-            GRun('git-read-tree', '--reset', tree_id).run()
+            GRun('read-tree', '--reset', tree_id).run()
         except GitRunException:
-            raise GitException, 'Failed git-read-tree --reset %s' % tree_id
+            raise GitException, 'Failed "git read-tree" --reset %s' % tree_id
 
-    cmd = ['git-checkout-index', '-q', '-u']
+    cmd = ['checkout-index', '-q', '-u']
     if force:
         cmd.append('-f')
     if files:
@@ -822,13 +826,13 @@ def switch(tree_id, keep = False):
     """
     if keep:
         # only update the index while keeping the local changes
-        GRun('git-read-tree', tree_id).run()
+        GRun('read-tree', tree_id).run()
     else:
         refresh_index()
         try:
-            GRun('git-read-tree', '-u', '-m', get_head(), tree_id).run()
+            GRun('read-tree', '-u', '-m', get_head(), tree_id).run()
         except GitRunException:
-            raise GitException, 'git-read-tree failed (local changes maybe?)'
+            raise GitException, 'read-tree failed (local changes maybe?)'
 
     __set_head(tree_id)
 
@@ -853,7 +857,7 @@ def reset(files = None, tree_id = None, check_out = True):
         __set_head(tree_id)
 
 def fetch(repository = 'origin', refspec = None):
-    """Fetches changes from the remote repository, using 'git-fetch'
+    """Fetches changes from the remote repository, using 'git fetch'
     by default.
     """
     # we update the HEAD
@@ -865,10 +869,10 @@ def fetch(repository = 'origin', refspec = None):
 
     command = config.get('branch.%s.stgit.fetchcmd' % get_head_file()) or \
               config.get('stgit.fetchcmd')
-    GRun(*(command.split() + args)).run()
+    Run(*(command.split() + args)).run()
 
 def pull(repository = 'origin', refspec = None):
-    """Fetches changes from the remote repository, using 'git-pull'
+    """Fetches changes from the remote repository, using 'git pull'
     by default.
     """
     # we update the HEAD
@@ -880,7 +884,7 @@ def pull(repository = 'origin', refspec = None):
 
     command = config.get('branch.%s.stgit.pullcmd' % get_head_file()) or \
               config.get('stgit.pullcmd')
-    GRun(*(command.split() + args)).run()
+    Run(*(command.split() + args)).run()
 
 def rebase(tree_id = None):
     """Rebase the current tree to the give tree_id. The tree_id
@@ -898,7 +902,7 @@ def rebase(tree_id = None):
     if command:
         # clear the HEAD cache as the custom rebase command will update it
         __clear_head_cache()
-        GRun(*(command.split() + args)).run()
+        Run(*(command.split() + args)).run()
     else:
         # default rebasing
         reset(tree_id = tree_id)
@@ -906,7 +910,7 @@ def rebase(tree_id = None):
 def repack():
     """Repack all objects into a single pack
     """
-    GRun('git-repack', '-a', '-d', '-f').run()
+    GRun('repack', '-a', '-d', '-f').run()
 
 def apply_patch(filename = None, diff = None, base = None,
                 fail_dump = True):
@@ -929,7 +933,7 @@ def apply_patch(filename = None, diff = None, base = None,
         refresh_index()
 
     try:
-        GRun('git-apply', '--index').raw_input(diff).no_output()
+        GRun('apply', '--index').raw_input(diff).no_output()
     except GitRunException:
         if base:
             switch(orig_head)
@@ -950,13 +954,13 @@ def apply_patch(filename = None, diff = None, base = None,
 
 def clone(repository, local_dir):
     """Clone a remote repository. At the moment, just use the
-    'git-clone' script
+    'git clone' script
     """
-    GRun('git-clone', repository, local_dir).run()
+    GRun('clone', repository, local_dir).run()
 
 def modifying_revs(files, base_rev, head_rev):
     """Return the revisions from the list modifying the given files."""
-    return GRun('git-rev-list', '%s..%s' % (base_rev, head_rev), '--', *files
+    return GRun('rev-list', '%s..%s' % (base_rev, head_rev), '--', *files
                 ).output_lines()
 
 def refspec_localpart(refspec):
@@ -1054,4 +1058,4 @@ def all_refs():
     """Return a list of all refs in the current repository.
     """
 
-    return [line.split()[1] for line in GRun('git-show-ref').output_lines()]
+    return [line.split()[1] for line in GRun('show-ref').output_lines()]

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index 058b6ac4dec8d09939c5887df88381859396baa4..4c90e1a7833e0aae510a1d5870c232fc7cbabc7e 100644 (file)
--- a/stgit/gitmergeonefile.py
+++ b/stgit/gitmergeonefile.py
@@ -59,24 +59,24 @@ def __checkout_files(orig_hash, file1_hash, file2_hash,
 
     if orig_hash:
         orig = path + extensions['ancestor']
-        tmp = MRun('git-unpack-file', orig_hash).output_one_line()
+        tmp = MRun('git', 'unpack-file', orig_hash).output_one_line()
         os.chmod(tmp, int(orig_mode, 8))
         os.renames(tmp, orig)
     if file1_hash:
         src1 = path + extensions['current']
-        tmp = MRun('git-unpack-file', file1_hash).output_one_line()
+        tmp = MRun('git', 'unpack-file', file1_hash).output_one_line()
         os.chmod(tmp, int(file1_mode, 8))
         os.renames(tmp, src1)
     if file2_hash:
         src2 = path + extensions['patched']
-        tmp = MRun('git-unpack-file', file2_hash).output_one_line()
+        tmp = MRun('git', 'unpack-file', file2_hash).output_one_line()
         os.chmod(tmp, int(file2_mode, 8))
         os.renames(tmp, src2)
 
     if file1_hash and not os.path.exists(path):
         # the current file might be removed by GIT when it is a new
         # file added in both branches. Just re-generate it
-        tmp = MRun('git-unpack-file', file1_hash).output_one_line()
+        tmp = MRun('git', 'unpack-file', file1_hash).output_one_line()
         os.chmod(tmp, int(file1_mode, 8))
         os.renames(tmp, path)
 
@@ -161,13 +161,13 @@ def merge(orig_hash, file1_hash, file2_hash,
         if file1_hash and file2_hash:
             # if modes are the same (git-read-tree probably dealt with it)
             if file1_hash == file2_hash:
-                if os.system('git-update-index --cacheinfo %s %s %s'
+                if os.system('git update-index --cacheinfo %s %s %s'
                              % (file1_mode, file1_hash, path)) != 0:
-                    out.error('git-update-index failed')
+                    out.error('git update-index failed')
                     __conflict(path)
                     return 1
-                if os.system('git-checkout-index -u -f -- %s' % path):
-                    out.error('git-checkout-index failed')
+                if os.system('git checkout-index -u -f -- %s' % path):
+                    out.error('git checkout-index failed')
                     __conflict(path)
                     return 1
                 if file1_mode != file2_mode:
@@ -182,14 +182,14 @@ def merge(orig_hash, file1_hash, file2_hash,
                                                     'output': path }) == 0
 
                 if merge_ok:
-                    os.system('git-update-index -- %s' % path)
+                    os.system('git update-index -- %s' % path)
                     __remove_files(orig_hash, file1_hash, file2_hash)
                     return 0
                 else:
                     out.error('Three-way merge tool failed for file "%s"'
                               % path)
                     # reset the cache to the first branch
-                    os.system('git-update-index --cacheinfo %s %s %s'
+                    os.system('git update-index --cacheinfo %s %s %s'
                               % (file1_mode, file1_hash, path))
 
                     if config.get('stgit.autoimerge') == 'yes':
@@ -204,7 +204,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                             __conflict(path)
                             return 1
                         # successful interactive merge
-                        os.system('git-update-index -- %s' % path)
+                        os.system('git update-index -- %s' % path)
                         __remove_files(orig_hash, file1_hash, file2_hash)
                         return 0
                     else:
@@ -220,7 +220,7 @@ def merge(orig_hash, file1_hash, file2_hash,
             if os.path.exists(path):
                 os.remove(path)
             __remove_files(orig_hash, file1_hash, file2_hash)
-            return os.system('git-update-index --remove -- %s' % path)
+            return os.system('git update-index --remove -- %s' % path)
         # file deleted in one and changed in the other
         else:
             # Do something here - we must at least merge the entry in
@@ -228,14 +228,14 @@ def merge(orig_hash, file1_hash, file2_hash,
             # fact, stg resolved does not handle that.
 
             # Do the same thing cogito does - remove the file in any case.
-            os.system('git-update-index --remove -- %s' % path)
+            os.system('git update-index --remove -- %s' % path)
 
             #if file1_hash:
                 ## file deleted upstream and changed in the patch. The
                 ## patch is probably going to move the changes
                 ## elsewhere.
 
-                #os.system('git-update-index --remove -- %s' % path)
+                #os.system('git update-index --remove -- %s' % path)
             #else:
                 ## file deleted in the patch and changed upstream. We
                 ## could re-delete it, but for now leave it there -
@@ -243,7 +243,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                 ## the file.
 
                 ## reset the cache to the first branch
-                #os.system('git-update-index --cacheinfo %s %s %s'
+                #os.system('git update-index --cacheinfo %s %s %s'
                 #          % (file1_mode, file1_hash, path))
             __conflict(path)
             return 1
@@ -254,13 +254,13 @@ def merge(orig_hash, file1_hash, file2_hash,
         if file1_hash and file2_hash:
             # files are the same
             if file1_hash == file2_hash:
-                if os.system('git-update-index --add --cacheinfo %s %s %s'
+                if os.system('git update-index --add --cacheinfo %s %s %s'
                              % (file1_mode, file1_hash, path)) != 0:
-                    out.error('git-update-index failed')
+                    out.error('git update-index failed')
                     __conflict(path)
                     return 1
-                if os.system('git-checkout-index -u -f -- %s' % path):
-                    out.error('git-checkout-index failed')
+                if os.system('git checkout-index -u -f -- %s' % path):
+                    out.error('git checkout-index failed')
                     __conflict(path)
                     return 1
                 if file1_mode != file2_mode:
@@ -272,7 +272,7 @@ def merge(orig_hash, file1_hash, file2_hash,
             else:
                 out.error('File "%s" added in branches but different' % path)
                 # reset the cache to the first branch
-                os.system('git-update-index --cacheinfo %s %s %s'
+                os.system('git update-index --cacheinfo %s %s %s'
                           % (file1_mode, file1_hash, path))
 
                 if config.get('stgit.autoimerge') == 'yes':
@@ -287,7 +287,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                         __conflict(path)
                         return 1
                     # successful interactive merge
-                    os.system('git-update-index -- %s' % path)
+                    os.system('git update-index -- %s' % path)
                     __remove_files(orig_hash, file1_hash, file2_hash)
                     return 0
                 else:
@@ -304,13 +304,13 @@ def merge(orig_hash, file1_hash, file2_hash,
             else:
                 mode = file2_mode
                 obj = file2_hash
-            if os.system('git-update-index --add --cacheinfo %s %s %s'
+            if os.system('git update-index --add --cacheinfo %s %s %s'
                          % (mode, obj, path)) != 0:
-                out.error('git-update-index failed')
+                out.error('git update-index failed')
                 __conflict(path)
                 return 1
             __remove_files(orig_hash, file1_hash, file2_hash)
-            return os.system('git-checkout-index -u -f -- %s' % path)
+            return os.system('git checkout-index -u -f -- %s' % path)
 
     # Unhandled case
     out.error('Unhandled merge conflict: "%s" "%s" "%s" "%s" "%s" "%s" "%s"'

diff --git a/stgit/stack.py b/stgit/stack.py
index f72f83b0bd4eb3711da5a98b204ae0d5facb55bf..1130210de3f8d5052c4f34e84ab7b6203054eb53 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -370,10 +370,10 @@ class PatchSet(StgitObject):
 
 
 def shortlog(patches):
-    log = ''.join(Run('git-log', '--pretty=short',
+    log = ''.join(Run('git', 'log', '--pretty=short',
                       p.get_top(), '^%s' % p.get_bottom()).raw_output()
                   for p in patches)
-    return Run('git-shortlog').raw_input(log).raw_output()
+    return Run('git', 'shortlog').raw_input(log).raw_output()
 
 class Series(PatchSet):
     """Class including the operations on series