From 3c8dea1f8d7c4257d080f9f34159cdb2fffb81e6 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 29 May 2009 18:38:17 -0700 Subject: Change project.revision to revisionExpr and revisionId The revisionExpr field now holds an expression from the manifest, such as "refs/heads/master", while revisionId holds the current commit-ish SHA-1 of the revisionExpr. Currently that is only filled in if the manifest points directly to a SHA-1. Signed-off-by: Shawn O. Pearce --- subcmds/forall.py | 6 ++---- subcmds/init.py | 6 +++--- subcmds/sync.py | 7 ++----- 3 files changed, 7 insertions(+), 12 deletions(-) (limited to 'subcmds') diff --git a/subcmds/forall.py b/subcmds/forall.py index 8d701a6c..b66313d7 100644 --- a/subcmds/forall.py +++ b/subcmds/forall.py @@ -160,10 +160,8 @@ terminal and are not redirected. setenv('REPO_PROJECT', project.name) setenv('REPO_PATH', project.relpath) setenv('REPO_REMOTE', project.remote.name) - setenv('REPO_LREV', project\ - .GetRemote(project.remote.name)\ - .ToLocal(project.revision)) - setenv('REPO_RREV', project.revision) + setenv('REPO_LREV', project.GetRevisionId()) + setenv('REPO_RREV', project.revisionExpr) if mirror: setenv('GIT_DIR', project.gitdir) diff --git a/subcmds/init.py b/subcmds/init.py index 0d0fcd06..5ba4d794 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -113,12 +113,12 @@ to update the working directory files. m._InitGitDir() if opt.manifest_branch: - m.revision = opt.manifest_branch + m.revisionExpr = opt.manifest_branch else: - m.revision = 'refs/heads/master' + m.revisionExpr = 'refs/heads/master' else: if opt.manifest_branch: - m.revision = opt.manifest_branch + m.revisionExpr = opt.manifest_branch else: m.PreSync() diff --git a/subcmds/sync.py b/subcmds/sync.py index c61c3bb4..9c9a3b78 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -207,17 +207,14 @@ def _VerifyTag(project): warning: Cannot automatically authenticate repo.""" return True - remote = project.GetRemote(project.remote.name) - ref = remote.ToLocal(project.revision) - try: - cur = project.bare_git.describe(ref) + cur = project.bare_git.describe(project.GetRevisionId()) except GitError: cur = None if not cur \ or re.compile(r'^.*-[0-9]{1,}-g[0-9a-f]{1,}$').match(cur): - rev = project.revision + rev = project.revisionExpr if rev.startswith(R_HEADS): rev = rev[len(R_HEADS):] -- cgit v1.2.3-54-g00ecf