35 |
35 |
36 def warnobserrors(orig, ui, repo, *args, **kwargs): |
36 def warnobserrors(orig, ui, repo, *args, **kwargs): |
37 """display warning is the command resulted in more instable changeset""" |
37 """display warning is the command resulted in more instable changeset""" |
38 priorunstables = len(repo.revs('unstable()')) |
38 priorunstables = len(repo.revs('unstable()')) |
39 priorlatecomers = len(repo.revs('latecomer()')) |
39 priorlatecomers = len(repo.revs('latecomer()')) |
|
40 priorconflictings = len(repo.revs('conflicting()')) |
40 #print orig, priorunstables |
41 #print orig, priorunstables |
41 #print len(repo.revs('secret() - obsolete()')) |
42 #print len(repo.revs('secret() - obsolete()')) |
42 try: |
43 try: |
43 return orig(ui, repo, *args, **kwargs) |
44 return orig(ui, repo, *args, **kwargs) |
44 finally: |
45 finally: |
45 newunstables = len(repo.revs('unstable()')) - priorunstables |
46 newunstables = len(repo.revs('unstable()')) - priorunstables |
46 newlatecomers = len(repo.revs('latecomer()')) - priorlatecomers |
47 newlatecomers = len(repo.revs('latecomer()')) - priorlatecomers |
|
48 newconflictings = len(repo.revs('conflicting()')) - priorconflictings |
47 #print orig, newunstables |
49 #print orig, newunstables |
48 #print len(repo.revs('secret() - obsolete()')) |
50 #print len(repo.revs('secret() - obsolete()')) |
49 if newunstables > 0: |
51 if newunstables > 0: |
50 ui.warn(_('%i new unstables changesets\n') % newunstables) |
52 ui.warn(_('%i new unstables changesets\n') % newunstables) |
51 if newlatecomers > 0: |
53 if newlatecomers > 0: |
52 ui.warn(_('%i new latecomers changesets\n') % newlatecomers) |
54 ui.warn(_('%i new latecomers changesets\n') % newlatecomers) |
|
55 if newconflictings > 0: |
|
56 ui.warn(_('%i new conflictings changesets\n') % newconflictings) |
53 |
57 |
54 ### changeset rewriting logic |
58 ### changeset rewriting logic |
55 ############################# |
59 ############################# |
56 |
60 |
57 def rewrite(repo, old, updates, head, newbases, commitopts): |
61 def rewrite(repo, old, updates, head, newbases, commitopts): |