1 """Python GIT interface
5 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
7 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License version 2 as
9 published by the Free Software Foundation.
11 This program is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details.
16 You should have received a copy of the GNU General Public License
17 along with this program; if not, write to the Free Software
18 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 import sys
, os
, re
, gitmergeonefile
22 from shutil
import copyfile
24 from stgit
.exception
import *
25 from stgit
import basedir
26 from stgit
.utils
import *
27 from stgit
.out
import *
28 from stgit
.run
import *
29 from stgit
.config
import config
32 class GitException(StgException
):
35 # When a subprocess has a problem, we want the exception to be a
36 # subclass of GitException.
37 class GitRunException(GitException
):
48 """An author, committer, etc."""
49 def __init__(self
, name
= None, email
= None, date
= '',
51 self
.name
= self
.email
= self
.date
= None
52 if name
or email
or date
:
58 assert not (name
or email
or date
)
60 m
= re
.match(r
'^(.+)<(.+)>(.*)$', s
)
62 return [x
.strip() or None for x
in m
.groups()]
63 self
.name
, self
.email
, self
.date
= parse_desc(desc
)
64 def set_name(self
, val
):
67 def set_email(self
, val
):
70 def set_date(self
, val
):
74 if self
.name
and self
.email
:
75 return '%s <%s>' % (self
.name
, self
.email
)
77 raise GitException
, 'not enough identity data'
80 """Handle the commit objects
82 def __init__(self
, id_hash
):
83 self
.__id
_hash
= id_hash
85 lines
= GRun('git-cat-file', 'commit', id_hash
).output_lines()
86 for i
in range(len(lines
)):
89 break # we've seen all the header fields
90 key
, val
= line
.split(' ', 1)
95 elif key
== 'committer':
96 self
.__committer
= val
98 pass # ignore other headers
99 self
.__log
= '\n'.join(lines
[i
+1:])
101 def get_id_hash(self
):
102 return self
.__id
_hash
107 def get_parent(self
):
108 parents
= self
.get_parents()
114 def get_parents(self
):
115 return GRun('git-rev-list', '--parents', '--max-count=1', self
.__id
_hash
116 ).output_one_line().split()[1:]
118 def get_author(self
):
121 def get_committer(self
):
122 return self
.__committer
128 return self
.get_id_hash()
130 # dictionary of Commit objects, used to avoid multiple calls to git
137 def get_commit(id_hash
):
138 """Commit objects factory. Save/look-up them in the __commits
143 if id_hash
in __commits
:
144 return __commits
[id_hash
]
146 commit
= Commit(id_hash
)
147 __commits
[id_hash
] = commit
151 """Return the list of file conflicts
153 conflicts_file
= os
.path
.join(basedir
.get(), 'conflicts')
154 if os
.path
.isfile(conflicts_file
):
155 f
= file(conflicts_file
)
156 names
= [line
.strip() for line
in f
.readlines()]
163 files
= [os
.path
.join(basedir
.get(), 'info', 'exclude')]
164 user_exclude
= config
.get('core.excludesfile')
166 files
.append(user_exclude
)
169 def ls_files(files
, tree
= None, full_name
= True):
170 """Return the files known to GIT or raise an error otherwise. It also
171 converts the file to the full path relative the the .git directory.
178 args
.append('--with-tree=%s' % tree
)
180 args
.append('--full-name')
184 return GRun('git-ls-files', '--error-unmatch', *args
).output_lines()
185 except GitRunException
:
186 # just hide the details of the git-ls-files command we use
187 raise GitException
, \
188 'Some of the given paths are either missing or not known to GIT'
190 def tree_status(files
= None, tree_id
= 'HEAD', unknown
= False,
191 noexclude
= True, verbose
= False, diff_flags
= []):
192 """Get the status of all changed files, or of a selected set of
193 files. Returns a list of pairs - (status, filename).
195 If 'not files', it will check all files, and optionally all
196 unknown files. If 'files' is a list, it will only check the files
199 assert not files
or not unknown
202 out
.start('Checking for changes in the working directory')
210 cmd
= ['git-ls-files', '-z', '--others', '--directory',
211 '--no-empty-directory']
213 cmd
+= ['--exclude=%s' % s
for s
in
214 ['*.[ao]', '*.pyc', '.*', '*~', '#*', 'TAGS', 'tags']]
215 cmd
+= ['--exclude-per-directory=.gitignore']
216 cmd
+= ['--exclude-from=%s' % fn
217 for fn
in exclude_files()
218 if os
.path
.exists(fn
)]
220 lines
= GRun(*cmd
).raw_output().split('\0')
221 cache_files
+= [('?', line
) for line
in lines
if line
]
224 conflicts
= get_conflicts()
227 cache_files
+= [('C', filename
) for filename
in conflicts
228 if not files
or filename
in files
]
231 args
= diff_flags
+ [tree_id
]
233 args
+= ['--'] + files
234 for line
in GRun('git-diff-index', *args
).output_lines():
235 fs
= tuple(line
.rstrip().split(' ',4)[-1].split('\t',1))
236 if fs
[1] not in conflicts
:
237 cache_files
.append(fs
)
244 def local_changes(verbose
= True):
245 """Return true if there are local changes in the tree
247 return len(tree_status(verbose
= verbose
)) != 0
251 hr
= re
.compile(r
'^[0-9a-f]{40} refs/heads/(.+)$')
252 for line
in GRun('git-show-ref', '--heads').output_lines():
254 heads
.append(m
.group(1))
261 """Verifies the HEAD and returns the SHA1 id that represents it
266 __head
= rev_parse('HEAD')
269 class DetachedHeadException(GitException
):
271 GitException
.__init
__(self
, 'Not on any branch')
274 """Return the name of the file pointed to by the HEAD symref.
275 Throw an exception if HEAD is detached."""
278 'refs/heads/', GRun('git-symbolic-ref', '-q', 'HEAD'
280 except GitRunException
:
281 raise DetachedHeadException()
283 def set_head_file(ref
):
284 """Resets HEAD to point to a new ref
286 # head cache flushing is needed since we might have a different value
290 GRun('git-symbolic-ref', 'HEAD', 'refs/heads/%s' % ref
).run()
291 except GitRunException
:
292 raise GitException
, 'Could not set head to "%s"' % ref
294 def set_ref(ref
, val
):
295 """Point ref at a new commit object."""
297 GRun('git-update-ref', ref
, val
).run()
298 except GitRunException
:
299 raise GitException
, 'Could not update %s to "%s".' % (ref
, val
)
301 def set_branch(branch
, val
):
302 set_ref('refs/heads/%s' % branch
, val
)
305 """Sets the HEAD value
309 if not __head
or __head
!= val
:
313 # only allow SHA1 hashes
314 assert(len(__head
) == 40)
316 def __clear_head_cache():
317 """Sets the __head to None so that a re-read is forced
324 """Refresh index with stat() information from the working directory.
326 GRun('git-update-index', '-q', '--unmerged', '--refresh').run()
328 def rev_parse(git_id
):
329 """Parse the string and return a verified SHA1 id
332 return GRun('git-rev-parse', '--verify', git_id
333 ).discard_stderr().output_one_line()
334 except GitRunException
:
335 raise GitException
, 'Unknown revision: %s' % git_id
344 def branch_exists(branch
):
345 return ref_exists('refs/heads/%s' % branch
)
347 def create_branch(new_branch
, tree_id
= None):
348 """Create a new branch in the git repository
350 if branch_exists(new_branch
):
351 raise GitException
, 'Branch "%s" already exists' % new_branch
353 current_head
= get_head()
354 set_head_file(new_branch
)
355 __set_head(current_head
)
357 # a checkout isn't needed if new branch points to the current head
361 if os
.path
.isfile(os
.path
.join(basedir
.get(), 'MERGE_HEAD')):
362 os
.remove(os
.path
.join(basedir
.get(), 'MERGE_HEAD'))
364 def switch_branch(new_branch
):
365 """Switch to a git branch
369 if not branch_exists(new_branch
):
370 raise GitException
, 'Branch "%s" does not exist' % new_branch
372 tree_id
= rev_parse('refs/heads/%s^{commit}' % new_branch
)
373 if tree_id
!= get_head():
376 GRun('git-read-tree', '-u', '-m', get_head(), tree_id
).run()
377 except GitRunException
:
378 raise GitException
, 'git-read-tree failed (local changes maybe?)'
380 set_head_file(new_branch
)
382 if os
.path
.isfile(os
.path
.join(basedir
.get(), 'MERGE_HEAD')):
383 os
.remove(os
.path
.join(basedir
.get(), 'MERGE_HEAD'))
386 if not ref_exists(ref
):
387 raise GitException
, '%s does not exist' % ref
388 sha1
= GRun('git-show-ref', '-s', ref
).output_one_line()
390 GRun('git-update-ref', '-d', ref
, sha1
).run()
391 except GitRunException
:
392 raise GitException
, 'Failed to delete ref %s' % ref
394 def delete_branch(name
):
395 delete_ref('refs/heads/%s' % name
)
397 def rename_ref(from_ref
, to_ref
):
398 if not ref_exists(from_ref
):
399 raise GitException
, '"%s" does not exist' % from_ref
400 if ref_exists(to_ref
):
401 raise GitException
, '"%s" already exists' % to_ref
403 sha1
= GRun('git-show-ref', '-s', from_ref
).output_one_line()
405 GRun('git-update-ref', to_ref
, sha1
, '0'*40).run()
406 except GitRunException
:
407 raise GitException
, 'Failed to create new ref %s' % to_ref
409 GRun('git-update-ref', '-d', from_ref
, sha1
).run()
410 except GitRunException
:
411 raise GitException
, 'Failed to delete ref %s' % from_ref
413 def rename_branch(from_name
, to_name
):
414 """Rename a git branch."""
415 rename_ref('refs/heads/%s' % from_name
, 'refs/heads/%s' % to_name
)
417 if get_head_file() == from_name
:
418 set_head_file(to_name
)
419 except DetachedHeadException
:
420 pass # detached HEAD, so the renamee can't be the current branch
421 reflog_dir
= os
.path
.join(basedir
.get(), 'logs', 'refs', 'heads')
422 if os
.path
.exists(reflog_dir
) \
423 and os
.path
.exists(os
.path
.join(reflog_dir
, from_name
)):
424 rename(reflog_dir
, from_name
, to_name
)
427 """Add the files or recursively add the directory contents
429 # generate the file list
432 if not os
.path
.exists(i
):
433 raise GitException
, 'Unknown file or directory: %s' % i
436 # recursive search. We only add files
437 for root
, dirs
, local_files
in os
.walk(i
):
438 for name
in [os
.path
.join(root
, f
) for f
in local_files
]:
439 if os
.path
.isfile(name
):
440 files
.append(os
.path
.normpath(name
))
441 elif os
.path
.isfile(i
):
442 files
.append(os
.path
.normpath(i
))
444 raise GitException
, '%s is not a file or directory' % i
448 GRun('git-update-index', '--add', '--').xargs(files
)
449 except GitRunException
:
450 raise GitException
, 'Unable to add file'
452 def __copy_single(source
, target
, target2
=''):
453 """Copy file or dir named 'source' to name target+target2"""
455 # "source" (file or dir) must match one or more git-controlled file
456 realfiles
= GRun('git-ls-files', source
).output_lines()
457 if len(realfiles
) == 0:
458 raise GitException
, '"%s" matches no git-controled files' % source
460 if os
.path
.isdir(source
):
461 # physically copy the files, and record them to add them in one run
463 re_string
='^'+source
+'/(.*)$'
464 prefix_regexp
= re
.compile(re_string
)
465 for f
in [f
.strip() for f
in realfiles
]:
466 m
= prefix_regexp
.match(f
)
468 raise Exception, '"%s" does not match "%s"' % (f
, re_string
)
469 newname
= target
+target2
+'/'+m
.group(1)
470 if not os
.path
.exists(os
.path
.dirname(newname
)):
471 os
.makedirs(os
.path
.dirname(newname
))
473 newfiles
.append(newname
)
476 else: # files, symlinks, ...
477 newname
= target
+target2
478 copyfile(source
, newname
)
482 def copy(filespecs
, target
):
483 if os
.path
.isdir(target
):
484 # target is a directory: copy each entry on the command line,
485 # with the same name, into the target
486 target
= target
.rstrip('/')
488 # first, check that none of the children of the target
489 # matching the command line aleady exist
490 for filespec
in filespecs
:
491 entry
= target
+ '/' + os
.path
.basename(filespec
.rstrip('/'))
492 if os
.path
.exists(entry
):
493 raise GitException
, 'Target "%s" already exists' % entry
495 for filespec
in filespecs
:
496 filespec
= filespec
.rstrip('/')
497 basename
= '/' + os
.path
.basename(filespec
)
498 __copy_single(filespec
, target
, basename
)
500 elif os
.path
.exists(target
):
501 raise GitException
, 'Target "%s" exists but is not a directory' % target
502 elif len(filespecs
) != 1:
503 raise GitException
, 'Cannot copy more than one file to non-directory'
506 # at this point: len(filespecs)==1 and target does not exist
508 # check target directory
509 targetdir
= os
.path
.dirname(target
)
510 if targetdir
!= '' and not os
.path
.isdir(targetdir
):
511 raise GitException
, 'Target directory "%s" does not exist' % targetdir
513 __copy_single(filespecs
[0].rstrip('/'), target
)
516 def rm(files
, force
= False):
517 """Remove a file from the repository
521 if os
.path
.exists(f
):
522 raise GitException
, '%s exists. Remove it first' %f
524 GRun('git-update-index', '--remove', '--').xargs(files
)
527 GRun('git-update-index', '--force-remove', '--').xargs(files
)
535 """Return the user information.
539 name
=config
.get('user.name')
540 email
=config
.get('user.email')
541 __user
= Person(name
, email
)
545 """Return the author information.
550 # the environment variables take priority over config
552 date
= os
.environ
['GIT_AUTHOR_DATE']
555 __author
= Person(os
.environ
['GIT_AUTHOR_NAME'],
556 os
.environ
['GIT_AUTHOR_EMAIL'],
563 """Return the author information.
568 # the environment variables take priority over config
570 date
= os
.environ
['GIT_COMMITTER_DATE']
573 __committer
= Person(os
.environ
['GIT_COMMITTER_NAME'],
574 os
.environ
['GIT_COMMITTER_EMAIL'],
580 def update_cache(files
= None, force
= False):
581 """Update the cache information for the given files
583 cache_files
= tree_status(files
, verbose
= False)
585 # everything is up-to-date
586 if len(cache_files
) == 0:
589 # check for unresolved conflicts
590 if not force
and [x
for x
in cache_files
591 if x
[0] not in ['M', 'N', 'A', 'D']]:
592 raise GitException
, 'Updating cache failed: unresolved conflicts'
595 add_files
= [x
[1] for x
in cache_files
if x
[0] in ['N', 'A']]
596 rm_files
= [x
[1] for x
in cache_files
if x
[0] in ['D']]
597 m_files
= [x
[1] for x
in cache_files
if x
[0] in ['M']]
599 GRun('git-update-index', '--add', '--').xargs(add_files
)
600 GRun('git-update-index', '--force-remove', '--').xargs(rm_files
)
601 GRun('git-update-index', '--').xargs(m_files
)
605 def commit(message
, files
= None, parents
= None, allowempty
= False,
606 cache_update
= True, tree_id
= None, set_head
= False,
607 author_name
= None, author_email
= None, author_date
= None,
608 committer_name
= None, committer_email
= None):
609 """Commit the current tree to repository
614 # Get the tree status
615 if cache_update
and parents
!= []:
616 changes
= update_cache(files
)
617 if not changes
and not allowempty
:
618 raise GitException
, 'No changes to commit'
620 # get the commit message
623 elif message
[-1:] != '\n':
626 # write the index to repository
628 tree_id
= GRun('git-write-tree').output_one_line()
634 env
['GIT_AUTHOR_NAME'] = author_name
636 env
['GIT_AUTHOR_EMAIL'] = author_email
638 env
['GIT_AUTHOR_DATE'] = author_date
640 env
['GIT_COMMITTER_NAME'] = committer_name
642 env
['GIT_COMMITTER_EMAIL'] = committer_email
643 commit_id
= GRun('git-commit-tree', tree_id
,
644 *sum([['-p', p
] for p
in parents
], [])
645 ).env(env
).raw_input(message
).output_one_line()
647 __set_head(commit_id
)
651 def apply_diff(rev1
, rev2
, check_index
= True, files
= None):
652 """Apply the diff between rev1 and rev2 onto the current
653 index. This function doesn't need to raise an exception since it
654 is only used for fast-pushing a patch. If this operation fails,
655 the pushing would fall back to the three-way merge.
658 index_opt
= ['--index']
665 diff_str
= diff(files
, rev1
, rev2
)
668 GRun('git-apply', *index_opt
).raw_input(
669 diff_str
).discard_stderr().no_output()
670 except GitRunException
:
675 def merge(base
, head1
, head2
, recursive
= False):
676 """Perform a 3-way merge between base, head1 and head2 into the
683 # this operation tracks renames but it is slower (used in
684 # general when pushing or picking patches)
686 # discard output to mask the verbose prints of the tool
687 GRun('git-merge-recursive', base
, '--', head1
, head2
689 except GitRunException
, ex
:
693 # the fast case where we don't track renames (used when the
694 # distance between base and heads is small, i.e. folding or
695 # synchronising patches)
697 GRun('git-read-tree', '-u', '-m', '--aggressive',
698 base
, head1
, head2
).run()
699 except GitRunException
:
700 raise GitException
, 'git-read-tree failed (local changes maybe?)'
702 # check the index for unmerged entries
704 stages_re
= re
.compile('^([0-7]+) ([0-9a-f]{40}) ([1-3])\t(.*)$', re
.S
)
706 for line
in GRun('git-ls-files', '--unmerged', '--stage', '-z'
707 ).raw_output().split('\0'):
711 mode
, hash, stage
, path
= stages_re
.findall(line
)[0]
713 if not path
in files
:
715 files
[path
]['1'] = ('', '')
716 files
[path
]['2'] = ('', '')
717 files
[path
]['3'] = ('', '')
719 files
[path
][stage
] = (mode
, hash)
721 if err_output
and not files
:
722 # if no unmerged files, there was probably a different type of
723 # error and we have to abort the merge
724 raise GitException
, err_output
726 # merge the unmerged files
729 # remove additional files that might be generated for some
730 # newer versions of GIT
731 for suffix
in [base
, head1
, head2
]:
734 fname
= path
+ '~' + suffix
735 if os
.path
.exists(fname
):
739 if gitmergeonefile
.merge(stages
['1'][1], stages
['2'][1],
740 stages
['3'][1], path
, stages
['1'][0],
741 stages
['2'][0], stages
['3'][0]) != 0:
745 raise GitException
, 'GIT index merging failed (possible conflicts)'
747 def diff(files
= None, rev1
= 'HEAD', rev2
= None, diff_flags
= []):
748 """Show the diff between rev1 and rev2
754 return GRun('git-diff-tree', '-p',
755 *(diff_flags
+ [rev1
, rev2
, '--'] + files
)).raw_output()
759 return GRun('git-diff-index', '-p', '-R',
760 *(diff_flags
+ [rev2
, '--'] + files
)).raw_output()
762 return GRun('git-diff-index', '-p',
763 *(diff_flags
+ [rev1
, '--'] + files
)).raw_output()
767 # TODO: take another parameter representing a diff string as we
768 # usually invoke git.diff() form the calling functions
769 def diffstat(files
= None, rev1
= 'HEAD', rev2
= None):
770 """Return the diffstat between rev1 and rev2."""
771 return GRun('git-apply', '--stat', '--summary'
772 ).raw_input(diff(files
, rev1
, rev2
)).raw_output()
774 def files(rev1
, rev2
, diff_flags
= []):
775 """Return the files modified between rev1 and rev2
779 for line
in GRun('git-diff-tree', *(diff_flags
+ ['-r', rev1
, rev2
])
781 result
.append('%s %s' % tuple(line
.split(' ', 4)[-1].split('\t', 1)))
783 return '\n'.join(result
)
785 def barefiles(rev1
, rev2
):
786 """Return the files modified between rev1 and rev2, without status info
790 for line
in GRun('git-diff-tree', '-r', rev1
, rev2
).output_lines():
791 result
.append(line
.split(' ', 4)[-1].split('\t', 1)[-1])
793 return '\n'.join(result
)
795 def pretty_commit(commit_id
= 'HEAD', diff_flags
= []):
796 """Return a given commit (log + diff)
798 return GRun('git-diff-tree',
800 + ['--cc', '--always', '--pretty', '-r', commit_id
])
803 def checkout(files
= None, tree_id
= None, force
= False):
804 """Check out the given or all files
808 GRun('git-read-tree', '--reset', tree_id
).run()
809 except GitRunException
:
810 raise GitException
, 'Failed git-read-tree --reset %s' % tree_id
812 cmd
= ['git-checkout-index', '-q', '-u']
816 GRun(*(cmd
+ ['--'])).xargs(files
)
818 GRun(*(cmd
+ ['-a'])).run()
820 def switch(tree_id
, keep
= False):
821 """Switch the tree to the given id
826 GRun('git-read-tree', '-u', '-m', get_head(), tree_id
).run()
827 except GitRunException
:
828 raise GitException
, 'git-read-tree failed (local changes maybe?)'
832 def reset(files
= None, tree_id
= None, check_out
= True):
833 """Revert the tree changes relative to the given tree_id. It removes
840 cache_files
= tree_status(files
, tree_id
)
841 # files which were added but need to be removed
842 rm_files
= [x
[1] for x
in cache_files
if x
[0] in ['A']]
844 checkout(files
, tree_id
, True)
845 # checkout doesn't remove files
846 map(os
.remove
, rm_files
)
848 # if the reset refers to the whole tree, switch the HEAD as well
852 def fetch(repository
= 'origin', refspec
= None):
853 """Fetches changes from the remote repository, using 'git-fetch'
863 command
= config
.get('branch.%s.stgit.fetchcmd' % get_head_file()) or \
864 config
.get('stgit.fetchcmd')
865 GRun(*(command
.split() + args
)).run()
867 def pull(repository
= 'origin', refspec
= None):
868 """Fetches changes from the remote repository, using 'git-pull'
878 command
= config
.get('branch.%s.stgit.pullcmd' % get_head_file()) or \
879 config
.get('stgit.pullcmd')
880 GRun(*(command
.split() + args
)).run()
882 def rebase(tree_id
= None):
883 """Rebase the current tree to the give tree_id. The tree_id
884 argument may be something other than a GIT id if an external
887 command
= config
.get('branch.%s.stgit.rebasecmd' % get_head_file()) \
888 or config
.get('stgit.rebasecmd')
894 raise GitException
, 'Default rebasing requires a commit id'
896 # clear the HEAD cache as the custom rebase command will update it
898 GRun(*(command
.split() + args
)).run()
901 reset(tree_id
= tree_id
)
904 """Repack all objects into a single pack
906 GRun('git-repack', '-a', '-d', '-f').run()
908 def apply_patch(filename
= None, diff
= None, base
= None,
910 """Apply a patch onto the current or given index. There must not
911 be any local changes in the tree, otherwise the command fails
923 orig_head
= get_head()
929 GRun('git-apply', '--index').raw_input(diff
).no_output()
930 except GitRunException
:
934 # write the failed diff to a file
935 f
= file('.stgit-failed.patch', 'w+')
938 out
.warn('Diff written to the .stgit-failed.patch file')
943 top
= commit(message
= 'temporary commit used for applying a patch',
946 merge(base
, orig_head
, top
)
948 def clone(repository
, local_dir
):
949 """Clone a remote repository. At the moment, just use the
952 GRun('git-clone', repository
, local_dir
).run()
954 def modifying_revs(files
, base_rev
, head_rev
):
955 """Return the revisions from the list modifying the given files."""
956 return GRun('git-rev-list', '%s..%s' % (base_rev
, head_rev
), '--', *files
959 def refspec_localpart(refspec
):
960 m
= re
.match('^[^:]*:([^:]*)$', refspec
)
964 raise GitException
, 'Cannot parse refspec "%s"' % line
966 def refspec_remotepart(refspec
):
967 m
= re
.match('^([^:]*):[^:]*$', refspec
)
971 raise GitException
, 'Cannot parse refspec "%s"' % line
974 def __remotes_from_config():
975 return config
.sections_matching(r
'remote\.(.*)\.url')
977 def __remotes_from_dir(dir):
978 d
= os
.path
.join(basedir
.get(), dir)
979 if os
.path
.exists(d
):
985 """Return the list of remotes in the repository
987 return (set(__remotes_from_config())
988 |
set(__remotes_from_dir('remotes'))
989 |
set(__remotes_from_dir('branches')))
991 def remotes_local_branches(remote
):
992 """Returns the list of local branches fetched from given remote
996 if remote
in __remotes_from_config():
997 for line
in config
.getall('remote.%s.fetch' % remote
):
998 branches
.append(refspec_localpart(line
))
999 elif remote
in __remotes_from_dir('remotes'):
1000 stream
= open(os
.path
.join(basedir
.get(), 'remotes', remote
), 'r')
1002 # Only consider Pull lines
1003 m
= re
.match('^Pull: (.*)\n$', line
)
1005 branches
.append(refspec_localpart(m
.group(1)))
1007 elif remote
in __remotes_from_dir('branches'):
1008 # old-style branches only declare one branch
1009 branches
.append('refs/heads/'+remote
);
1011 raise GitException
, 'Unknown remote "%s"' % remote
1015 def identify_remote(branchname
):
1016 """Return the name for the remote to pull the given branchname
1017 from, or None if we believe it is a local branch.
1020 for remote
in remotes_list():
1021 if branchname
in remotes_local_branches(remote
):
1024 # if we get here we've found nothing, the branch is a local one
1028 """Return the git id for the tip of the parent branch as left by
1033 stream
= open(os
.path
.join(basedir
.get(), 'FETCH_HEAD'), "r")
1035 # Only consider lines not tagged not-for-merge
1036 m
= re
.match('^([^\t]*)\t\t', line
)
1039 raise GitException
, 'StGit does not support multiple FETCH_HEAD'
1041 fetch_head
=m
.group(1)
1045 out
.warn('No for-merge remote head found in FETCH_HEAD')
1047 # here we are sure to have a single fetch_head
1051 """Return a list of all refs in the current repository.
1054 return [line
.split()[1] for line
in GRun('git-show-ref').output_lines()]