X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a2dcde7196ecd4e2c6d8bfff825d9b00a366c323..5072554705c126bf4987fc078da2bd6f68787bdc:/stgit/git.py diff --git a/stgit/git.py b/stgit/git.py index a45671b..d5bd724 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -import sys, os, glob, popen2 +import sys, os, popen2 from stgit.utils import * @@ -59,7 +59,7 @@ class Commit: self.__author = field[1] 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 @@ -92,6 +92,8 @@ def get_commit(id_hash): """Commit objects factory. Save/look-up them in the __commits dictionary """ + global __commits + if id_hash in __commits: return __commits[id_hash] else: @@ -214,29 +216,123 @@ def local_changes(): """ return len(__tree_status()) != 0 +# HEAD value cached +__head = None + def get_head(): - """Returns a string representing the HEAD + """Verifies the HEAD and returns the SHA1 id that represents it """ - return read_string(head_link) + global __head + + if not __head: + __head = rev_parse('HEAD') + return __head def get_head_file(): """Returns the name of the file pointed to by the HEAD link """ - # valid link - if os.path.islink(head_link) and os.path.isfile(head_link): - return os.path.basename(os.readlink(head_link)) - else: - raise GitException, 'Invalid .git/HEAD link. Git tree not initialised?' + return os.path.basename(_output_one_line('git-symbolic-ref HEAD')) + +def set_head_file(ref): + """Resets HEAD to point to a new ref + """ + # head cache flushing is needed since we might have a different value + # in the new head + __clear_head_cache() + if __run('git-symbolic-ref HEAD', [ref]) != 0: + raise GitException, 'Could not set head to "%s"' % ref def __set_head(val): """Sets the HEAD value """ - write_string(head_link, val) + global __head + + if not __head or __head != val: + if __run('git-update-ref HEAD', [val]) != 0: + raise GitException, 'Could not update HEAD to "%s".' % val + __head = val + +def __clear_head_cache(): + """Sets the __head to None so that a re-read is forced + """ + global __head + + __head = None def rev_parse(git_id): - """Parse the string and return an SHA1 id + """Parse the string and return a verified SHA1 id + """ + try: + return _output_one_line(['git-rev-parse', '--verify', git_id]) + except GitException: + raise GitException, 'Unknown revision: %s' % git_id + +def branch_exists(branch): + """Existance check for the named branch + """ + for line in _output_lines(['git-rev-parse', '--symbolic', '--all']): + if line.strip() == branch: + return True + return False + +def create_branch(new_branch, tree_id = None): + """Create a new branch in the git repository + """ + new_head = os.path.join('refs', 'heads', new_branch) + if branch_exists(new_head): + raise GitException, 'Branch "%s" already exists' % new_branch + + current_head = get_head() + set_head_file(new_head) + __set_head(current_head) + + # a checkout isn't needed if new branch points to the current head + if tree_id: + switch(tree_id) + + if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')): + os.remove(os.path.join(base_dir, 'MERGE_HEAD')) + +def switch_branch(name): + """Switch to a git branch """ - return _output(['git-rev-parse', git_id]).strip() + global __head + + new_head = os.path.join('refs', 'heads', name) + if not branch_exists(new_head): + raise GitException, 'Branch "%s" does not exist' % name + + tree_id = rev_parse(new_head + '^0') + if tree_id != get_head(): + if __run('git-read-tree -u -m', [get_head(), tree_id]) != 0: + raise GitException, 'git-read-tree failed (local changes maybe?)' + __head = tree_id + set_head_file(new_head) + + if os.path.isfile(os.path.join(base_dir, 'MERGE_HEAD')): + os.remove(os.path.join(base_dir, 'MERGE_HEAD')) + +def delete_branch(name): + """Delete a git branch + """ + branch_head = os.path.join('refs', 'heads', name) + if not branch_exists(branch_head): + raise GitException, 'Branch "%s" does not exist' % name + os.remove(os.path.join(base_dir, branch_head)) + +def rename_branch(from_name, to_name): + """Rename a git branch + """ + from_head = os.path.join('refs', 'heads', from_name) + if not branch_exists(from_head): + raise GitException, 'Branch "%s" does not exist' % from_name + to_head = os.path.join('refs', 'heads', to_name) + if branch_exists(to_head): + raise GitException, 'Branch "%s" already exists' % to_name + + if get_head_file() == from_name: + set_head_file(to_head) + os.rename(os.path.join(base_dir, from_head), os.path.join(base_dir, to_head)) def add(names): """Add the files or recursively add the directory contents @@ -265,11 +361,6 @@ def add(names): def rm(files, force = False): """Remove a file from the repository """ - if force: - git_opt = '--force-remove' - else: - git_opt = '--remove' - if not force: for f in files: if os.path.exists(f): @@ -355,6 +446,15 @@ def commit(message, files = [], parents = [], allowempty = False, 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 @@ -364,7 +464,7 @@ def merge(base, head1, head2): # this can fail if there are conflicts if os.system('git-merge-index -o -q gitmergeonefile.py -a') != 0: - raise GitException, 'git-merge-cache failed (possible conflicts)' + raise GitException, 'git-merge-index failed (possible conflicts)' def status(files = [], modified = False, new = False, deleted = False, conflict = False, unknown = False, noexclude = False): @@ -486,6 +586,9 @@ def pull(repository = 'origin', refspec = None): """Pull changes from the remote repository. At the moment, just use the 'git pull' command """ + # 'git pull' updates the HEAD + __clear_head_cache() + args = [repository] if refspec: args.append(refspec) @@ -493,17 +596,35 @@ def pull(repository = 'origin', refspec = None): if __run('git pull', args) != 0: 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 +def apply_patch(filename = 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 """ + def __apply_patch(): + if filename: + return __run('git-apply --index', [filename]) == 0 + else: + try: + _input('git-apply --index', sys.stdin) + except GitException: + return False + return True + os.system('git-update-index --refresh > /dev/null') - if filename: - if __run('git-apply --index', [filename]) != 0: - raise GitException, 'Patch does not apply cleanly' - else: - _input('git-apply --index', sys.stdin) + if base: + orig_head = get_head() + switch(base) + + if not __apply_patch(): + if base: + switch(orig_head) + raise GitException, 'Patch does not apply cleanly' + elif base: + top = commit(message = 'temporary commit used for applying a patch', + parents = [base]) + switch(orig_head) + merge(base, orig_head, top) def clone(repository, local_dir): """Clone a remote repository. At the moment, just use the