X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a5b29a1c486dc8f6b3080356296dfed25c210a74..3c6fbd2cb3fd1d2a18585d3c13cd4517021b2f36:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index ae29eb8..ea80be6 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,10 +54,10 @@ 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:]) @@ -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() @@ -119,8 +126,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,7 +166,8 @@ def __run(cmd, args=None): def __check_base_dir(): return os.path.isdir(base_dir) -def __tree_status(files = [], tree_id = 'HEAD', unknown = False): +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') @@ -164,14 +176,20 @@ def __tree_status(files = [], tree_id = 'HEAD', unknown = False): # unknown files if unknown: - exclude_file = os.path.join(base_dir, 'exclude') - 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) - lines = _output_lines(['git-ls-files', '--others', - '--exclude=*.[ao]', '--exclude=.*' - '--exclude=TAGS', '--exclude=tags', '--exclude=*~', - '--exclude=#*'] + extra_exclude) + 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 + + extra_exclude) cache_files += [('?', line.strip()) for line in lines] # conflicted files @@ -254,75 +272,56 @@ def rm(files, force = False): if files: __run('git-update-cache --force-remove --', files) -def update_cache(files): +def update_cache(files = [], force = False): """Update the cache information for the given files """ - files_here = [] - files_gone = [] + cache_files = __tree_status(files) - for f in files: - if os.path.exists(f): - files_here.append(f) - else: - files_gone.append(f) + # everything is up-to-date + if len(cache_files) == 0: + return False + + # check for unresolved conflicts + if not force and [x for x in cache_files + if x[0] not in ['M', 'N', 'A', 'D']]: + raise GitException, 'Updating cache failed: unresolved conflicts' + + # update the cache + add_files = [x[1] for x in cache_files if x[0] in ['N', 'A']] + 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 files_here: - __run('git-update-cache --', files_here) - if files_gone: - __run('git-update-cache --remove --', files_gone) + 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' + + return True def commit(message, files = [], parents = [], allowempty = False, + 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 """ - first = (parents == []) - # Get the tree status - if not first: - cache_files = __tree_status(files) - - if not first and len(cache_files) == 0 and not allowempty: - raise GitException, 'No changes to commit' - - # check for unresolved conflicts - if not first and len(filter(lambda x: x[0] not in ['M', 'N', 'A', 'D'], - cache_files)) != 0: - raise GitException, 'Commit failed: unresolved conflicts' + if cache_update and parents != []: + changes = update_cache(files) + if not changes and not allowempty: + 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() - - # update the cache - if not first: - add_files=[] - rm_files=[] - m_files=[] - for f in cache_files: - if f[0] in ['N', 'A']: - add_files.append(f[1]) - elif f[0] == 'D': - rm_files.append(f[1]) - else: - m_files.append(f[1]) - - if add_files: - if __run('git-update-cache --add --', add_files): - raise GitException, 'Failed git-update-cache --add' - if rm_files: - if __run('git-update-cache --force-remove --', rm_files): - raise GitException, 'Failed git-update-cache --rm' - if m_files: - if __run('git-update-cache --', m_files): - raise GitException, 'Failed git-update-cache' + 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 = '' @@ -342,11 +341,9 @@ 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 @@ -358,18 +355,14 @@ 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-cache -o -q gitmergeonefile.py -a') != 0: raise GitException, 'git-merge-cache failed (possible conflicts)' - # this should not fail - if os.system('git-checkout-cache -f -a') != 0: - raise GitException, 'Failed git-checkout-cache' - def status(files = [], modified = False, new = False, deleted = False, - conflict = False, unknown = False): + conflict = False, unknown = False, noexclude = False): """Show the tree status """ - cache_files = __tree_status(files, unknown = True) + cache_files = __tree_status(files, unknown = True, noexclude = noexclude) all = not (modified or new or deleted or conflict or unknown) if not all: @@ -385,7 +378,7 @@ def status(files = [], modified = False, new = False, deleted = False, filestat.append('C') if unknown: filestat.append('?') - cache_files = filter(lambda x: x[0] in filestat, cache_files) + cache_files = [x for x in cache_files if x[0] in filestat] for fs in cache_files: if all: @@ -396,11 +389,11 @@ 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: + os.system('git-update-cache --refresh > /dev/null') diff_str = _output(['git-diff-cache', '-p', rev1] + files) if out_fd: @@ -412,7 +405,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() @@ -424,7 +416,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)): @@ -432,6 +423,16 @@ 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 """ @@ -457,18 +458,32 @@ def switch(tree_id): __set_head(tree_id) -def pull(location, head = None, tag = None): - """Fetch changes from the remote repository. At the moment, just - use the 'git fetch' scripts +def reset(tree_id = None): + """Revert the tree changes relative to the given tree_id. It removes + any local changes + """ + if not tree_id: + tree_id = get_head() + + cache_files = __tree_status(tree_id = tree_id) + rm_files = [x[1] for x in cache_files if x[0] in ['D']] + + checkout(tree_id = tree_id, force = True) + __set_head(tree_id) + + # checkout doesn't remove files + map(os.remove, rm_files) + +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