D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in test-bisect.t:190 > What does None mean here? Oh, _conflictsmsg() is returning None which is getting printed. I will send a follow-up for this. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D219 To: pulkit, #hg-reviewers, durin42 Cc: durin42, quark, akushner, martinvonz, durham, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
martinvonz added inline comments. INLINE COMMENTS > test-bisect.t:190 > + > + None > + # To mark the changeset good:hg bisect --good What does None mean here? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D219 To: pulkit, #hg-reviewers, durin42 Cc: durin42, quark, akushner, martinvonz, durham, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
durin42 (Augie Fackler) wrote: > I've heard no objections, but also the suggestion that --terse be > something like --terse-dirs or similar so it's obviously not the antonym > of --verbose. Maybe --collapse? I think that's what you do when you've got a directory tree in a GUI and you rotate the little triangle thingie, which is pretty much what --terse does. Danek ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
This revision was automatically updated to reflect the committed changes. Closed by commit rHG96f43981c1c4: morestatus: move fb extension to core by plugging to `hg status --verbose` (authored by pulkit). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D219?vs=577=798#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D219?vs=577=798 REVISION DETAIL https://phab.mercurial-scm.org/D219 AFFECTED FILES mercurial/cmdutil.py mercurial/commands.py mercurial/configitems.py tests/test-bisect.t tests/test-conflict.t tests/test-graft.t tests/test-histedit-fold.t tests/test-rebase-conflicts.t tests/test-shelve.t CHANGE DETAILS diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -342,6 +342,23 @@ warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') [1] + $ hg status -v + M a/a + M b.rename/b + M c.copy + R b/b + ? a/a.orig + # The repository is in an unfinished *unshelve* state. + + # Unresolved merge conflicts: + # + # a/a + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort + ensure that we have a merge with unresolved conflicts diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -71,6 +71,21 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] + $ hg status --config commands.status.verbose=1 + M common + ? common.orig + # The repository is in an unfinished *rebase* state. + + # Unresolved merge conflicts: + # + # common + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg rebase --continue + # To abort: hg rebase --abort + + Try to continue without solving the conflict: $ hg rebase --continue diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t --- a/tests/test-histedit-fold.t +++ b/tests/test-histedit-fold.t @@ -294,9 +294,21 @@ [1] There were conflicts, we keep P1 content. This should effectively drop the changes from +6. - $ hg status + + $ hg status -v M file ? file.orig + # The repository is in an unfinished *histedit* state. + + # Unresolved merge conflicts: + # + # file + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg histedit --continue + # To abort: hg histedit --abort + $ hg resolve -l U file $ hg revert -r 'p1()' file diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -221,6 +221,25 @@ $ hg summary |grep graft commit: 2 modified, 2 unknown, 1 unresolved (graft in progress) +Using status to get more context + + $ hg status --verbose + M d + M e + ? a.orig + ? e.orig + # The repository is in an unfinished *graft* state. + + # Unresolved merge conflicts: + # + # e + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg graft --continue + # To abort: hg update --clean .(warning: this will discard uncommitted changes) + + Commit while interrupted should fail: $ hg ci -m 'commit interrupted graft' diff --git a/tests/test-conflict.t b/tests/test-conflict.t --- a/tests/test-conflict.t +++ b/tests/test-conflict.t @@ -44,6 +44,23 @@ $ hg id 618808747361+c0c68e4fe667+ tip + $ echo "[commands]" >> $HGRCPATH + $ echo "status.verbose=true" >> $HGRCPATH + $ hg status + M a + ? a.orig + # The repository is in an unfinished *merge* state. + + # Unresolved merge conflicts: + # + # a + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg commit + # To abort: hg update --clean .(warning: this will discard uncommitted changes) + + $ cat a Small Mathematical Series. 1 @@ -58,7 +75,7 @@ >>> merge rev:c0c68e4fe667 - test: branch1 Hop we are done. - $ hg status + $ hg status --config commands.status.verbose=0 M a ? a.orig diff --git a/tests/test-bisect.t b/tests/test-bisect.t --- a/tests/test-bisect.t +++ b/tests/test-bisect.t @@ -184,6 +184,15 @@ $ hg bisect -r $ hg bisect -b + $ hg status -v + # The repository is in an unfinished *bisect* state. + + None + # To mark the changeset good:hg bisect --good + # To mark the changeset bad: hg bisect --bad + # To abort: hg bisect --reset + + $ hg status -v --config commands.status.skipstates=bisect $ hg summary parent: 31:58c80a7c8a40 tip msg 31 diff --git a/mercurial/configitems.py b/mercurial/configitems.py ---
D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
durin42 accepted this revision. durin42 added a comment. This revision is now accepted and ready to land. I've heard no objections, but also the suggestion that --terse be something like --terse-dirs or similar so it's obviously not the antonym of --verbose. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D219 To: pulkit, #hg-reviewers, durin42 Cc: durin42, quark, akushner, martinvonz, durham, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
pulkit added a comment. In https://phab.mercurial-scm.org/D219#4343, @durin42 wrote: > I'm still a tiny bit worried about potential confusion between --terse and --verbose (in that they're not opposites), but I'm also fine with this. I'll take it in a couple of days if I don't hear any objections. Currently if we pass do `hg log --terse u --verbose`, it will still terse the output. I think the best way is to document that --verbose and --terse are not opposites. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D219 To: pulkit, #hg-reviewers, durin42 Cc: durin42, quark, akushner, martinvonz, durham, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
durin42 accepted this revision as: durin42. durin42 added a comment. I'm still a tiny bit worried about potential confusion between --terse and --verbose (in that they're not opposites), but I'm also fine with this. I'll take it in a couple of days if I don't hear any objections. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D219 To: pulkit, #hg-reviewers, durin42 Cc: durin42, quark, akushner, martinvonz, durham, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D219: morestatus: move fb extension to core by plugging to `hg status --verbose`
pulkit updated this revision to Diff 577. pulkit edited the summary of this revision. pulkit retitled this revision from "morestatus: move fb extension to core as '--repo-state' option to status" to "morestatus: move fb extension to core by plugging to `hg status --verbose`". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D219?vs=516=577 REVISION DETAIL https://phab.mercurial-scm.org/D219 AFFECTED FILES mercurial/cmdutil.py mercurial/commands.py mercurial/configitems.py tests/test-bisect.t tests/test-conflict.t tests/test-graft.t tests/test-histedit-fold.t tests/test-rebase-conflicts.t tests/test-shelve.t CHANGE DETAILS diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -342,6 +342,23 @@ warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') [1] + $ hg status -v + M a/a + M b.rename/b + M c.copy + R b/b + ? a/a.orig + # The repository is in an unfinished *unshelve* state. + + # Unresolved merge conflicts: + # + # a/a + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg unshelve --continue + # To abort: hg unshelve --abort + ensure that we have a merge with unresolved conflicts diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -71,6 +71,21 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] + $ hg status --config commands.status.verbose=1 + M common + ? common.orig + # The repository is in an unfinished *rebase* state. + + # Unresolved merge conflicts: + # + # common + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg rebase --continue + # To abort: hg rebase --abort + + Try to continue without solving the conflict: $ hg rebase --continue diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t --- a/tests/test-histedit-fold.t +++ b/tests/test-histedit-fold.t @@ -294,9 +294,21 @@ [1] There were conflicts, we keep P1 content. This should effectively drop the changes from +6. - $ hg status + + $ hg status -v M file ? file.orig + # The repository is in an unfinished *histedit* state. + + # Unresolved merge conflicts: + # + # file + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg histedit --continue + # To abort: hg histedit --abort + $ hg resolve -l U file $ hg revert -r 'p1()' file diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -221,6 +221,25 @@ $ hg summary |grep graft commit: 2 modified, 2 unknown, 1 unresolved (graft in progress) +Using status to get more context + + $ hg status --verbose + M d + M e + ? a.orig + ? e.orig + # The repository is in an unfinished *graft* state. + + # Unresolved merge conflicts: + # + # e + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg graft --continue + # To abort: hg update --clean .(warning: this will discard uncommitted changes) + + Commit while interrupted should fail: $ hg ci -m 'commit interrupted graft' diff --git a/tests/test-conflict.t b/tests/test-conflict.t --- a/tests/test-conflict.t +++ b/tests/test-conflict.t @@ -44,6 +44,23 @@ $ hg id 618808747361+c0c68e4fe667+ tip + $ echo "[commands]" >> $HGRCPATH + $ echo "status.verbose=true" >> $HGRCPATH + $ hg status + M a + ? a.orig + # The repository is in an unfinished *merge* state. + + # Unresolved merge conflicts: + # + # a + # + # To mark files as resolved: hg resolve --mark FILE + + # To continue:hg commit + # To abort: hg update --clean .(warning: this will discard uncommitted changes) + + $ cat a Small Mathematical Series. 1 @@ -58,7 +75,7 @@ >>> merge rev:c0c68e4fe667 - test: branch1 Hop we are done. - $ hg status + $ hg status --config commands.status.verbose=0 M a ? a.orig diff --git a/tests/test-bisect.t b/tests/test-bisect.t --- a/tests/test-bisect.t +++ b/tests/test-bisect.t @@ -184,6 +184,15 @@ $ hg bisect -r $ hg bisect -b + $ hg status -v + # The repository is in an unfinished *bisect* state. + + None + # To mark the changeset good:hg bisect --good + # To mark the changeset bad: hg bisect --bad + # To abort: hg bisect --reset + + $ hg status -v --config morestatus.skipstates=bisect $ hg summary parent: 31:58c80a7c8a40 tip msg 31 diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++
