mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: small improvements to user-preservation

Browse Source 
. Slightly more paranoid checking of results from 'p4 change'
. Remove superfluous "-G"
. Don't modify the username if it is unchanged.
. Add a comment in the change template to show what is
  going to be done.

Signed-off-by: Luke Diamand <luke@diamand.org>
Acked-By: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Luke Diamand 2011-05-07 11:19:43 +01:00 committed by Junio C Hamano
parent 3ea2cfd488
commit ecdba36da6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/fast-import/git-p4
View File

@ -690,10 +690,15 @@ class P4Submit(Command, P4UserMap):
def modifyChangelistUser(self, changelist, newUser): def modifyChangelistUser(self, changelist, newUser):
# fixup the user field of a changelist after it has been submitted. # fixup the user field of a changelist after it has been submitted.
changes = p4CmdList("change -o %s" % changelist) changes = p4CmdList("change -o %s" % changelist)
for c in changes: if len(changes) != 1:
if c.has_key('User'): die("Bad output from p4 change modifying %s to user %s" %
c['User'] = newUser (changelist, newUser))
input = marshal.dumps(changes[0])
c = changes[0]
if c['User'] == newUser: return # nothing to do
c['User'] = newUser
input = marshal.dumps(c)
result = p4CmdList("change -f -i", stdin=input) result = p4CmdList("change -f -i", stdin=input)
for r in result: for r in result:
if r.has_key('code'): if r.has_key('code'):
@ -707,7 +712,7 @@ class P4Submit(Command, P4UserMap):
def canChangeChangelists(self): def canChangeChangelists(self):
# check to see if we have p4 admin or super-user permissions, either of # check to see if we have p4 admin or super-user permissions, either of
# which are required to modify changelists. # which are required to modify changelists.
results = p4CmdList("-G protects %s" % self.depotPath) results = p4CmdList("protects %s" % self.depotPath)
for r in results: for r in results:
if r.has_key('perm'): if r.has_key('perm'):
if r['perm'] == 'admin': if r['perm'] == 'admin':
@ -865,6 +870,10 @@ class P4Submit(Command, P4UserMap):
if self.interactive: if self.interactive:
submitTemplate = self.prepareLogMessage(template, logMessage) submitTemplate = self.prepareLogMessage(template, logMessage)
if self.preserveUser:
submitTemplate = submitTemplate + ("\n######## Actual user %s, modified after commit\n" % p4User)
if os.environ.has_key("P4DIFF"): if os.environ.has_key("P4DIFF"):
del(os.environ["P4DIFF"]) del(os.environ["P4DIFF"])
diff = "" diff = ""