X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/9e3f506f0d0e1b0c09d1e9d7051af23bfede7834..HEAD:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index 13f7b87..6769a9f 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -23,6 +23,7 @@ import sys, os, popen2, re, gitmergeonefile from stgit import basedir from stgit.utils import * from stgit.config import config +from sets import Set # git exception class class GitException(Exception): @@ -262,10 +263,10 @@ def __tree_status(files = None, tree_id = 'HEAD', unknown = False, return cache_files -def local_changes(): +def local_changes(verbose = True): """Return true if there are local changes in the tree """ - return len(__tree_status(verbose = True)) != 0 + return len(__tree_status(verbose = verbose)) != 0 # HEAD value cached __head = None @@ -397,6 +398,11 @@ def rename_branch(from_name, to_name): rename(os.path.join(basedir.get(), 'refs', 'heads'), from_name, to_name) + reflog_dir = os.path.join(basedir.get(), 'logs', 'refs', 'heads') + if os.path.exists(reflog_dir) \ + and os.path.exists(os.path.join(reflog_dir, from_name)): + rename(reflog_dir, from_name, to_name) + def add(names): """Add the files or recursively add the directory contents """ @@ -444,10 +450,10 @@ def user(): """ global __user if not __user: - if config.has_option('user', 'name') \ - and config.has_option('user', 'email'): - __user = Person(config.get('user', 'name'), - config.get('user', 'email')) + name=config.get('user.name') + email=config.get('user.email') + if name and email: + __user = Person(name, email) else: raise GitException, 'unknown user details' return __user; @@ -596,17 +602,27 @@ def apply_diff(rev1, rev2, check_index = True, files = None): return True -def merge(base, head1, head2): +def merge(base, head1, head2, recursive = False): """Perform a 3-way merge between base, head1 and head2 into the local tree """ refresh_index() - try: - # use _output() to mask the verbose prints of the tool - _output('git-merge-recursive %s -- %s %s' % (base, head1, head2)) - except GitException: - pass + if recursive: + # this operation tracks renames but it is slower (used in + # general when pushing or picking patches) + try: + # use _output() to mask the verbose prints of the tool + _output('git-merge-recursive %s -- %s %s' % (base, head1, head2)) + except GitException: + pass + else: + # the fast case where we don't track renames (used when the + # distance between base and heads is small, i.e. folding or + # synchronising patches) + if __run('git-read-tree -u -m --aggressive', + [base, head1, head2]) != 0: + raise GitException, 'git-read-tree failed (local changes maybe?)' # check the index for unmerged entries files = {} @@ -629,6 +645,15 @@ def merge(base, head1, head2): # merge the unmerged files errors = False for path in files: + # remove additional files that might be generated for some + # newer versions of GIT + for suffix in [base, head1, head2]: + if not suffix: + continue + fname = path + '~' + suffix + if os.path.exists(fname): + os.remove(fname) + stages = files[path] if gitmergeonefile.merge(stages['1'][1], stages['2'][1], stages['3'][1], path, stages['1'][0], @@ -664,6 +689,8 @@ def status(files = None, modified = False, new = False, deleted = False, cache_files = [x for x in cache_files if x[0] in filestat] for fs in cache_files: + if files and not fs[1] in files: + continue if all: print '%s %s' % (fs[0], fs[1]) else: @@ -781,19 +808,20 @@ def reset(files = None, tree_id = None, check_out = True): if not files: __set_head(tree_id) -def pull(repository = 'origin', refspec = None): - """Pull changes from the remote repository. At the moment, just - use the 'git-pull' command +def fetch(repository = 'origin', refspec = None): + """Fetches changes from the remote repository, using 'git-fetch' + by default. """ - # 'git-pull' updates the HEAD + # we update the HEAD __clear_head_cache() args = [repository] if refspec: args.append(refspec) - if __run(config.get('stgit', 'pullcmd'), args) != 0: - raise GitException, 'Failed "git-pull %s"' % repository + command = config.get('stgit.pullcmd') + if __run(command, args) != 0: + raise GitException, 'Failed "%s %s"' % (command, repository) def repack(): """Repack all objects into a single pack @@ -805,12 +833,6 @@ def apply_patch(filename = None, diff = None, base = None, """Apply a patch onto the current or given index. There must not be any local changes in the tree, otherwise the command fails """ - if base: - orig_head = get_head() - switch(base) - else: - refresh_index() - if diff is None: if filename: f = file(filename) @@ -820,6 +842,12 @@ def apply_patch(filename = None, diff = None, base = None, if filename: f.close() + if base: + orig_head = get_head() + switch(base) + else: + refresh_index() + try: _input_str('git-apply --index', diff) except GitException: @@ -830,6 +858,7 @@ def apply_patch(filename = None, diff = None, base = None, f = file('.stgit-failed.patch', 'w+') f.write(diff) f.close() + print >> sys.stderr, 'Diff written to the .stgit-failed.patch file' raise @@ -854,3 +883,96 @@ def modifying_revs(files, base_rev): revs = [line.strip() for line in _output_lines(cmd + files)] return revs + + +def refspec_localpart(refspec): + m = re.match('^[^:]*:([^:]*)$', refspec) + if m: + return m.group(1) + else: + raise GitException, 'Cannot parse refspec "%s"' % line + +def refspec_remotepart(refspec): + m = re.match('^([^:]*):[^:]*$', refspec) + if m: + return m.group(1) + else: + raise GitException, 'Cannot parse refspec "%s"' % line + + +def __remotes_from_config(): + return config.sections_matching(r'remote\.(.*)\.url') + +def __remotes_from_dir(dir): + d = os.path.join(basedir.get(), dir) + if os.path.exists(d): + return os.listdir(d) + else: + return None + +def remotes_list(): + """Return the list of remotes in the repository + """ + + return Set(__remotes_from_config()) | \ + Set(__remotes_from_dir('remotes')) | \ + Set(__remotes_from_dir('branches')) + +def remotes_local_branches(remote): + """Returns the list of local branches fetched from given remote + """ + + branches = [] + if remote in __remotes_from_config(): + for line in config.getall('remote.%s.fetch' % remote): + branches.append(refspec_localpart(line)) + elif remote in __remotes_from_dir('remotes'): + stream = open(os.path.join(basedir.get(), 'remotes', remote), 'r') + for line in stream: + # Only consider Pull lines + m = re.match('^Pull: (.*)\n$', line) + if m: + branches.append(refspec_localpart(m.group(1))) + stream.close() + elif remote in __remotes_from_dir('branches'): + # old-style branches only declare one branch + branches.append('refs/heads/'+remote); + else: + raise GitException, 'Unknown remote "%s"' % remote + + return branches + +def identify_remote(branchname): + """Return the name for the remote to pull the given branchname + from, or None if we believe it is a local branch. + """ + + for remote in remotes_list(): + if branchname in remotes_local_branches(remote): + return remote + + # FIXME: in the case of local branch we should maybe set remote to + # "." but are we even sure it is the only case left ? + + # if we get here we've found nothing + return None + +def fetch_head(): + """Return the git id for the tip of the parent branch as left by + 'git fetch'. + """ + + fetch_head=None + stream = open(os.path.join(basedir.get(), 'FETCH_HEAD'), "r") + for line in stream: + # Only consider lines not tagged not-for-merge + m = re.match('^([^\t]*)\t\t', line) + if m: + if fetch_head: + raise GitException, "StGit does not support multiple FETCH_HEAD" + else: + fetch_head=m.group(1) + stream.close() + + # here we are sure to have a single fetch_head + return fetch_head