Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.5, 2.1, and 2.1.1

stable merge: prompt for a username if none defined before committing (closes #638)

Changeset 1163436d43b1…

Parent db0219ecd511…

by André Sintzoff

Changes to one file · Browse files at 1163436d43b1 Showing diff from parent db0219ecd511 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
694
695
696
 
 
 
 
697
698
699
 
700
701
702
 
694
695
696
697
698
699
700
701
702
 
703
704
705
706
@@ -694,9 +694,13 @@
    # merges must be committed without specifying file list   repo = self.wizard().repo + user = qtlib.getCurrentUsername(self, repo) + if not user: + return +   message = hglib.fromunicode(self.msg_text.text())   cmdline = ['commit', '--verbose', '--message', message, - '--repository', repo.root] + '--repository', repo.root, '--user', user]   commandlines = [cmdline]   pushafter = repo.ui.config('tortoisehg', 'cipushafter')   if pushafter: