X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/011cbd1b417a29bbcb189f86833bac773ba4a6f7..bca12bd1634520a9d1b81daa6a48e0b09a0df879:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index 40bcd78..56374bc 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -45,6 +45,7 @@ class Commit: self.__id_hash = id_hash lines = _output_lines('git-cat-file commit %s' % id_hash) + self.__parents = [] for i in range(len(lines)): line = lines[i] if line == '\n': @@ -53,12 +54,12 @@ class Commit: if field[0] == 'tree': self.__tree = field[1] elif field[0] == 'parent': - self.__parent = field[1] + self.__parents.append(field[1]) if field[0] == 'author': self.__author = field[1] - if field[0] == 'comitter': + if field[0] == 'committer': self.__committer = field[1] - self.__log = ''.join(lines[i:]) + self.__log = ''.join(lines[i+1:]) def get_id_hash(self): return self.__id_hash @@ -67,7 +68,10 @@ class Commit: return self.__tree def get_parent(self): - return self.__parent + return self.__parents[0] + + def get_parents(self): + return self.__parents def get_author(self): return self.__author @@ -75,6 +79,9 @@ class Commit: def get_committer(self): return self.__committer + def get_log(self): + return self.__log + # dictionary of Commit objects, used to avoid multiple calls to git __commits = dict() @@ -106,7 +113,10 @@ def get_conflicts(): def _input(cmd, file_desc): p = popen2.Popen3(cmd) - for line in file_desc: + while True: + line = file_desc.readline() + if not line: + break p.tochild.write(line) p.tochild.close() if p.wait(): @@ -119,8 +129,12 @@ def _output(cmd): raise GitException, '%s failed' % str(cmd) return string -def _output_one_line(cmd): +def _output_one_line(cmd, file_desc = None): p=popen2.Popen3(cmd) + if file_desc != None: + for line in file_desc: + p.tochild.write(line) + p.tochild.close() string = p.fromchild.readline().strip() if p.wait(): raise GitException, '%s failed' % str(cmd) @@ -155,25 +169,29 @@ def __run(cmd, args=None): def __check_base_dir(): return os.path.isdir(base_dir) -def __tree_status(files = [], tree_id = 'HEAD', unknown = False, noexclude = True): +def __tree_status(files = [], tree_id = 'HEAD', unknown = False, + noexclude = True): """Returns a list of pairs - [status, filename] """ - os.system('git-update-cache --refresh > /dev/null') + os.system('git-update-index --refresh > /dev/null') cache_files = [] # unknown files if unknown: - exclude_file = os.path.join(base_dir, 'exclude') - base_exclude = [ '--exclude=*.[ao]', '--exclude=.*' '--exclude=TAGS', - '--exclude=tags', '--exclude=*~', '--exclude=#*', - '--exclude-per-directory=.gitignore' ] - extra_exclude = [] + exclude_file = os.path.join(base_dir, 'info', 'exclude') + base_exclude = ['--exclude=%s' % s for s in + ['*.[ao]', '*.pyc', '.*', '*~', '#*', 'TAGS', 'tags']] + base_exclude.append('--exclude-per-directory=.gitignore') + if os.path.exists(exclude_file): - extra_exclude.append('--exclude-from=%s' % exclude_file) + extra_exclude = ['--exclude-from=%s' % exclude_file] + else: + extra_exclude = [] if noexclude: extra_exclude = base_exclude = [] - lines = _output_lines(['git-ls-files', '--others' ] + base_exclude + + lines = _output_lines(['git-ls-files', '--others'] + base_exclude + extra_exclude) cache_files += [('?', line.strip()) for line in lines] @@ -184,7 +202,7 @@ def __tree_status(files = [], tree_id = 'HEAD', unknown = False, noexclude = Tru cache_files += [('C', filename) for filename in conflicts] # the rest - for line in _output_lines(['git-diff-cache', '-r', tree_id] + files): + for line in _output_lines(['git-diff-index', '-r', tree_id] + files): fs = tuple(line.rstrip().split(' ',4)[-1].split('\t',1)) if fs[1] not in conflicts: cache_files.append(fs) @@ -215,6 +233,11 @@ def __set_head(val): """ write_string(head_link, val) +def rev_parse(git_id): + """Parse the string and return an SHA1 id + """ + return _output(['git-rev-parse', git_id]).strip() + def add(names): """Add the files or recursively add the directory contents """ @@ -236,7 +259,7 @@ def add(names): raise GitException, '%s is not a file or directory' % i if files: - if __run('git-update-cache --add --', files): + if __run('git-update-index --add --', files): raise GitException, 'Unable to add file' def rm(files, force = False): @@ -252,10 +275,10 @@ def rm(files, force = False): if os.path.exists(f): raise GitException, '%s exists. Remove it first' %f if files: - __run('git-update-cache --remove --', files) + __run('git-update-index --remove --', files) else: if files: - __run('git-update-cache --force-remove --', files) + __run('git-update-index --force-remove --', files) def update_cache(files = [], force = False): """Update the cache information for the given files @@ -276,17 +299,17 @@ def update_cache(files = [], 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']] - if add_files and __run('git-update-cache --add --', add_files) != 0: - raise GitException, 'Failed git-update-cache --add' - if rm_files and __run('git-update-cache --force-remove --', rm_files) != 0: - raise GitException, 'Failed git-update-cache --rm' - if m_files and __run('git-update-cache --', m_files) != 0: - raise GitException, 'Failed git-update-cache' + if add_files and __run('git-update-index --add --', add_files) != 0: + raise GitException, 'Failed git-update-index --add' + if rm_files and __run('git-update-index --force-remove --', rm_files) != 0: + raise GitException, 'Failed git-update-index --rm' + if m_files and __run('git-update-index --', m_files) != 0: + raise GitException, 'Failed git-update-index' return True def commit(message, files = [], parents = [], allowempty = False, - cache_update = True, + cache_update = True, tree_id = None, author_name = None, author_email = None, author_date = None, committer_name = None, committer_email = None): """Commit the current tree to repository @@ -298,15 +321,15 @@ def commit(message, files = [], parents = [], allowempty = False, raise GitException, 'No changes to commit' # get the commit message - f = file('.commitmsg', 'w+') - if message[-1:] == '\n': - f.write(message) - else: - print >> f, message - f.close() + if message[-1:] != '\n': + message += '\n' + must_switch = True # write the index to repository - tree_id = _output_one_line('git-write-tree') + if tree_id == None: + tree_id = _output_one_line('git-write-tree') + else: + must_switch = False # the commit cmd = '' @@ -326,14 +349,21 @@ def commit(message, files = [], parents = [], allowempty = False, for p in parents: cmd += ' -p %s' % p - cmd += ' < .commitmsg' - - commit_id = _output_one_line(cmd) - __set_head(commit_id) - os.remove('.commitmsg') + commit_id = _output_one_line(cmd, message) + if must_switch: + __set_head(commit_id) return commit_id +def apply_diff(rev1, rev2): + """Apply the diff between rev1 and rev2 onto the current + index. This function doesn't need to raise an exception since it + is only used for fast-pushing a patch. If this operation fails, + the pushing would fall back to the three-way merge. + """ + return os.system('git-diff-tree -p %s %s | git-apply --index 2> /dev/null' + % (rev1, rev2)) == 0 + def merge(base, head1, head2): """Perform a 3-way merge between base, head1 and head2 into the local tree @@ -342,7 +372,7 @@ def merge(base, head1, head2): raise GitException, 'git-read-tree failed (local changes maybe?)' # this can fail if there are conflicts - if os.system('git-merge-cache -o gitmergeonefile.py -a') != 0: + if os.system('git-merge-index -o -q gitmergeonefile.py -a') != 0: raise GitException, 'git-merge-cache failed (possible conflicts)' def status(files = [], modified = False, new = False, deleted = False, @@ -376,12 +406,12 @@ def status(files = [], modified = False, new = False, deleted = False, def diff(files = [], rev1 = 'HEAD', rev2 = None, out_fd = None): """Show the diff between rev1 and rev2 """ - os.system('git-update-cache --refresh > /dev/null') if rev2: diff_str = _output(['git-diff-tree', '-p', rev1, rev2] + files) else: - diff_str = _output(['git-diff-cache', '-p', rev1] + files) + os.system('git-update-index --refresh > /dev/null') + diff_str = _output(['git-diff-index', '-p', rev1] + files) if out_fd: out_fd.write(diff_str) @@ -392,7 +422,6 @@ def diffstat(files = [], rev1 = 'HEAD', rev2 = None): """Return the diffstat between rev1 and rev2 """ - os.system('git-update-cache --refresh > /dev/null') p=popen2.Popen3('git-apply --stat') diff(files, rev1, rev2, p.tochild) p.tochild.close() @@ -404,7 +433,6 @@ def diffstat(files = [], rev1 = 'HEAD', rev2 = None): def files(rev1, rev2): """Return the files modified between rev1 and rev2 """ - os.system('git-update-cache --refresh > /dev/null') str = '' for line in _output_lines('git-diff-tree -r %s %s' % (rev1, rev2)): @@ -412,13 +440,23 @@ def files(rev1, rev2): return str.rstrip() +def barefiles(rev1, rev2): + """Return the files modified between rev1 and rev2, without status info + """ + + str = '' + for line in _output_lines('git-diff-tree -r %s %s' % (rev1, rev2)): + str += '%s\n' % line.rstrip().split(' ',4)[-1].split('\t',1)[-1] + + return str.rstrip() + def checkout(files = [], tree_id = None, force = False): """Check out the given or all files """ if tree_id and __run('git-read-tree -m', [tree_id]) != 0: raise GitException, 'Failed git-read-tree -m %s' % tree_id - checkout_cmd = 'git-checkout-cache -q -u' + checkout_cmd = 'git-checkout-index -q -u' if force: checkout_cmd += ' -f' if len(files) == 0: @@ -427,7 +465,7 @@ def checkout(files = [], tree_id = None, force = False): checkout_cmd += ' --' if __run(checkout_cmd, files) != 0: - raise GitException, 'Failed git-checkout-cache' + raise GitException, 'Failed git-checkout-index' def switch(tree_id): """Switch the tree to the given id @@ -453,24 +491,22 @@ def reset(tree_id = None): # checkout doesn't remove files map(os.remove, rm_files) -def pull(location, head = None, tag = None): - """Fetch changes from the remote repository. At the moment, just - use the 'git fetch' scripts +def pull(repository = 'origin', refspec = None): + """Pull changes from the remote repository. At the moment, just + use the 'git pull' command """ - args = [location] - if head: - args += [head] - elif tag: - args += ['tag', tag] + args = [repository] + if refspec: + args.append(refspec) if __run('git pull', args) != 0: - raise GitException, 'Failed "git fetch %s"' % location + raise GitException, 'Failed "git pull %s"' % repository def apply_patch(filename = None): """Apply a patch onto the current index. There must not be any local changes in the tree, otherwise the command fails """ - os.system('git-update-cache --refresh > /dev/null') + os.system('git-update-index --refresh > /dev/null') if filename: if __run('git-apply --index', [filename]) != 0: