From: Yann Dirson <ydirson@altern.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 2/5] Allows extraction of information about remotes.
Date: Sat, 27 Jan 2007 12:21:22 +0100 [thread overview]
Message-ID: <20070127112122.16475.82057.stgit@gandelf.nowhere.earth> (raw)
In-Reply-To: <20070127104024.16475.81445.stgit@gandelf.nowhere.earth>
We want to know the list of declared remotes, the local branches they
hold, and which remotes holds a given branch. All this regardless of
where the information is stored.
If there are any git-1.5 remotes declared in .git/config, we suppose
you know what you're doing and they will take precedence on any
pre-1.5 remotes.
This does not use git-remote for now, since it is 1.5 material not
released yet, does not support legacy branches/ remotes, and does not
allow yet to query all of the information we need.
Signed-off-by: Yann Dirson <ydirson@altern.org>
---
stgit/git.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/stgit/git.py b/stgit/git.py
index 4c5685a..3c2c237 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -879,3 +879,78 @@ def modifying_revs(files, base_rev):
revs = [line.strip() for line in _output_lines(cmd + files)]
return revs
+
+
+def __remotes_from_config():
+ configremotes = []
+ stream = os.popen('git repo-config --get-regexp "^remote\..*\.url$"', 'r')
+ for line in stream:
+ m = re.match('^remote\.(.*)\.url ', line)
+ if m:
+ configremotes.append(m.group(1))
+ stream.close()
+ return configremotes
+
+def __remotes_from_dir(dir):
+ return os.listdir(os.path.join(basedir.get(), dir))
+
+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():
+ stream = os.popen('git repo-config --get-all "remote.%s.fetch"' % remote, 'r')
+ for line in stream:
+ # FIXME: should factorize refspec handling
+ m = re.match('^[^:]*:([^:]*)\n$', line)
+ if m:
+ branches.append(m.group(1))
+ else:
+ raise GitException, 'Cannot parse refspec "%s"' % line
+ stream.close()
+ 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:
+ refspec = m.group(1)
+ m = re.match('^[^:]*:([^:]*)$', refspec)
+ if m:
+ branches.append(m.group(1))
+ else:
+ raise GitException, 'Cannot parse refspec "%s"' % refspec
+ stream.close()
+ pass
+ elif remote in __remotes_from_dir('branches'):
+ # old-style branches only declare one branch
+ branches.append('refs/heads/'+remote);
+ pass
+ 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
next prev parent reply other threads:[~2007-01-27 11:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-27 11:21 [PATCH 0/5] [DRAFT] StGIT, remotes, and parent information Yann Dirson
2007-01-27 11:21 ` [PATCH 1/5] Move identification of parent branch's remote def up into stack class Yann Dirson
2007-01-27 11:21 ` Yann Dirson [this message]
2007-01-27 11:21 ` [PATCH 3/5] Basic support for keeping a ref to the parent branch Yann Dirson
2007-01-27 11:21 ` [PATCH 4/5] Have 'stg branch --create' record parent information Yann Dirson
2007-01-27 11:21 ` [PATCH 5/5] Make 'stg pull' use git-fetch and not git-pull Yann Dirson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070127112122.16475.82057.stgit@gandelf.nowhere.earth \
--to=ydirson@altern.org \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).