Tue, 04 Jul 2017 10:49:14 +0200 evolve: explain how to disable markers discovery in the documentation stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 04 Jul 2017 10:49:14 +0200] rev 2714
evolve: explain how to disable markers discovery in the documentation This is useful for large repository.
Thu, 06 Jul 2017 23:33:28 +0200 obshashrange: add cache warming instruction to the documentation
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 06 Jul 2017 23:33:28 +0200] rev 2713
obshashrange: add cache warming instruction to the documentation
Tue, 04 Jul 2017 01:30:14 +0530 topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 04 Jul 2017 01:30:14 +0530] rev 2712
topics: add t0 and b0 to the stack t0 or b0 will be the base of the stack and it's the parent of t1 or b1. The cool thing about this is that if you update to t0 using `hg up t0` or do `hg prev` on t1, you will be updated to t0 with the current topic preserved. This patch adds t0 to stack and implement the preserving topic case for t0 while using `hg update`.
Tue, 04 Jul 2017 00:15:36 +0530 topics: wrap the update function to check if either t0 or b0 is passed as rev
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 04 Jul 2017 00:15:36 +0530] rev 2711
topics: wrap the update function to check if either t0 or b0 is passed as rev t0 or b0, seriously, what's that. Do they even exist? Hold on and look for the next commits what we are trying to do.
Fri, 07 Jul 2017 00:42:18 +0200 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 07 Jul 2017 00:42:18 +0200] rev 2710
compat: adapt to change in 53b3a1968aa6-core
Sun, 02 Jul 2017 19:43:44 +0200 merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 19:43:44 +0200] rev 2709
merge back with stable (version updated in the process)
Sun, 02 Jul 2017 19:42:23 +0200 packaging: update versions to '.dev' one stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 19:42:23 +0200] rev 2708
packaging: update versions to '.dev' one This help to spot install from unreleased source.
Sun, 02 Jul 2017 19:40:56 +0200 Added tag 6.5.0 for changeset 734c0bc066cd stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 19:40:56 +0200] rev 2707
Added tag 6.5.0 for changeset 734c0bc066cd
Sun, 02 Jul 2017 19:35:38 +0200 packaging: prepare version 6.5.0 stable 6.5.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 19:35:38 +0200] rev 2706
packaging: prepare version 6.5.0
Sun, 02 Jul 2017 19:34:30 +0200 topic: update extensions metadata stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 19:34:30 +0200] rev 2705
topic: update extensions metadata Let us assign a version number to this release and add some more data about the extensions.
Sun, 02 Jul 2017 19:31:11 +0200 readme: prepare version 6.5.0 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 19:31:11 +0200] rev 2704
readme: prepare version 6.5.0
Sun, 02 Jul 2017 17:28:53 +0200 compat: merge with mercurial-3.9 mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 17:28:53 +0200] rev 2703
compat: merge with mercurial-3.9
Sun, 02 Jul 2017 17:28:38 +0200 compat: merge with mercurial-4.0 mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 17:28:38 +0200] rev 2702
compat: merge with mercurial-4.0
Sun, 02 Jul 2017 17:28:15 +0200 compat: merge with mercurial-4.1 mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 17:28:15 +0200] rev 2701
compat: merge with mercurial-4.1
Sun, 02 Jul 2017 18:22:39 +0200 compat: merge with stable mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 18:22:39 +0200] rev 2700
compat: merge with stable Nothing to report beside the drop of the obsfate related tests.
Sun, 02 Jul 2017 18:07:23 +0200 evolve: preserve the branch of the original changeset when evolving merge stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 18:07:23 +0200] rev 2699
evolve: preserve the branch of the original changeset when evolving merge
Sun, 02 Jul 2017 17:24:56 +0200 merge: default into stable to prepare next version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 17:24:56 +0200] rev 2698
merge: default into stable to prepare next version Let us prepare ourself for 6.5.0
Sun, 02 Jul 2017 17:13:35 +0200 obslog: handle patch generation for mercurial 4.1-
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 17:13:35 +0200] rev 2697
obslog: handle patch generation for mercurial 4.1- The unidiff API changed, we detect and work around that.
Sun, 02 Jul 2017 16:39:48 +0200 topic: also have the revbranchcache during the discovery
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 16:39:48 +0200] rev 2696
topic: also have the revbranchcache during the discovery
Sun, 02 Jul 2017 16:00:38 +0200 topic: cleanup the repository wrapping logic in topic discovery
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 16:00:38 +0200] rev 2695
topic: cleanup the repository wrapping logic in topic discovery We are know overriding the class so we do not need to update and restore the pushop itself.
Sun, 02 Jul 2017 15:02:51 +0200 topic: adapt to function migrate to obsutil
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 15:02:51 +0200] rev 2694
topic: adapt to function migrate to obsutil Mercurial 4.3 has a new module "obsutil" and multiple functions moved there. We handle the move for the one we care about.
Sun, 02 Jul 2017 15:02:11 +0200 evolve: adapt to function migrate to obsutil
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 15:02:11 +0200] rev 2693
evolve: adapt to function migrate to obsutil Mercurial 4.3 has a new module "obsutil" and multiple functions moved there. We handle the move for the one we care about.
Sun, 02 Jul 2017 14:10:44 +0200 topic: directly use the '_notpublic' revset
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 14:10:44 +0200] rev 2692
topic: directly use the '_notpublic' revset This is just more robust to achieve the same goal.
Sun, 02 Jul 2017 13:49:32 +0200 topic: drop the message about running evolve after topic change
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 13:49:32 +0200] rev 2691
topic: drop the message about running evolve after topic change Topic change is no longer creating a mess that needs cleaning.
Sun, 02 Jul 2017 13:48:45 +0200 template: handle lack of "users" in the obsfate data
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 02 Jul 2017 13:48:45 +0200] rev 2690
template: handle lack of "users" in the obsfate data This can happens when their are no markers (or the markers has no user data?)
Fri, 30 Jun 2017 16:29:26 +0200 doc: update effect flag documentation
Boris Feld <boris.feld@octobus.net> [Fri, 30 Jun 2017 16:29:26 +0200] rev 2689
doc: update effect flag documentation
Mon, 26 Jun 2017 17:20:08 +0200 obsfate: override the default log output
Boris Feld <boris.feld@octobus.net> [Mon, 26 Jun 2017 17:20:08 +0200] rev 2688
obsfate: override the default log output Override the default log output by showing obsfate if not empty.
Thu, 29 Jun 2017 23:42:29 +0200 evolve: fix documentation formatting
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 29 Jun 2017 23:42:29 +0200] rev 2687
evolve: fix documentation formatting The config example were formatted as standard paragraph.
Thu, 29 Jun 2017 18:22:06 +0200 compat: fix topicset for mercurial 4.1
Boris Feld <boris.feld@octobus.net> [Thu, 29 Jun 2017 18:22:06 +0200] rev 2686
compat: fix topicset for mercurial 4.1 The 'getrevset' method is not available there.
Mon, 26 Jun 2017 17:19:03 +0200 obsfate: refactor obsfate data computing
Boris Feld <boris.feld@octobus.net> [Mon, 26 Jun 2017 17:19:03 +0200] rev 2685
obsfate: refactor obsfate data computing Refactor how obsfate data are computed in order to reuse this logic later when hooking on default log output.
Thu, 29 Jun 2017 16:49:33 +0200 topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net> [Thu, 29 Jun 2017 16:49:33 +0200] rev 2684
topic: exclude public and topic changeset from branch stack Stack use-case is to show the current work in progress, which are symbolized by the phase draft and secret phase. Moreover showing public changesets in stack output when displaying current branch would display a lot of changesets for long-lived branches and would be quite useless. We also exclude topic changeset form the stack since they already exist on their own stack. getstack revsets didn't needed update when displaying a topic as when a changeset become public, its topic is no longer relevant.
Thu, 29 Jun 2017 16:29:08 +0200 tests: use a more portable form for new lines
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 29 Jun 2017 16:29:08 +0200] rev 2683
tests: use a more portable form for new lines
Thu, 29 Jun 2017 02:21:09 +0530 topic: don't abort if there is no current topic in stack() revset
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 29 Jun 2017 02:21:09 +0530] rev 2682
topic: don't abort if there is no current topic in stack() revset Named branches support has been added and we should not abort if there is no active topic.
Thu, 29 Jun 2017 01:58:26 +0530 topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 29 Jun 2017 01:58:26 +0530] rev 2681
topics: return a parse error if stack() revset is passed with argument
Thu, 29 Jun 2017 00:11:07 +0530 tests: add test to show topics working with shelve
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 29 Jun 2017 00:11:07 +0530] rev 2680
tests: add test to show topics working with shelve
Thu, 29 Jun 2017 02:31:55 +0530 topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 29 Jun 2017 02:31:55 +0530] rev 2679
topics: update current topic to the topic of newly rebased commit (issue5551) The rebase code passes branchmerge equals to True while updating to the rebased commit. We need to make sure topic is preserved even after rebase and hence we need to update the topic even when branchmerge argument is set to True. But there is a twist in the tale, merge also uses this part of code and we allow to update topic when brancmerge is True, in merge cases the topic after merge will the topic of the destination commit, not the topic of working directory parent. So we need the function to have information about whether a rebase is going on, and we do it by wrapping the rebase command and storing some value in the config. This is a bit hacky but works for now. This patch fixes issue related to loosing of topic while rebase. Thanks to Boris Feld for the rigourous tests.
Tue, 27 Jun 2017 23:28:58 +0530 docs: some fixes to the help text
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 27 Jun 2017 23:28:58 +0530] rev 2678
docs: some fixes to the help text
Mon, 26 Jun 2017 21:48:33 +0530 topics: pass 'topics' to ui.formatter instead of 'bookmarks'
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 26 Jun 2017 21:48:33 +0530] rev 2677
topics: pass 'topics' to ui.formatter instead of 'bookmarks'
Wed, 28 Jun 2017 17:28:56 +0200 topic: also insert the extra head check with using the new head checking
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 17:28:56 +0200] rev 2676
topic: also insert the extra head check with using the new head checking This will get the protection in place in all cases.
Wed, 28 Jun 2017 17:38:04 +0200 topic: some document for an obscure function
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 17:38:04 +0200] rev 2675
topic: some document for an obscure function
Wed, 28 Jun 2017 18:18:59 +0200 topic: adjust head checking wrapping to not interfere with concurrent push
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 18:18:59 +0200] rev 2674
topic: adjust head checking wrapping to not interfere with concurrent push In the previous form, the new topic head was detected as affected and the push was rejected. We introduce a of 'test-topic-push.t' using the new race checker as there have been many compatibility issue with this new checkers.
Wed, 28 Jun 2017 17:23:43 +0200 topic: also detect head checking using the concurrent part
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 17:23:43 +0200] rev 2673
topic: also detect head checking using the concurrent part
Wed, 28 Jun 2017 18:16:14 +0200 test: avoid 'test-check-commit.t' complaining copied code
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 18:16:14 +0200] rev 2672
test: avoid 'test-check-commit.t' complaining copied code We switch to git diff.
Wed, 28 Jun 2017 17:20:36 +0200 topic: small test cleanuo
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 17:20:36 +0200] rev 2671
topic: small test cleanuo The section was repeated.
Wed, 28 Jun 2017 01:53:21 +0200 topic: move the heads data to the branch line when appropriates
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 01:53:21 +0200] rev 2670
topic: move the heads data to the branch line when appropriates The topic line is dropped as it is quite confusing.
Wed, 28 Jun 2017 02:45:57 +0200 topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 02:45:57 +0200] rev 2669
topic: add some initial support for using stack on named branch Stack is a useful command that can make sense in other context. The current support is hacky and awful, but we have something!
Wed, 28 Jun 2017 01:58:09 +0200 topic: explicitly pass topic as a keyword argument
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 28 Jun 2017 01:58:09 +0200] rev 2668
topic: explicitly pass topic as a keyword argument This clarify all callers before adding more logic related to bare branch in stack.
Tue, 27 Jun 2017 15:21:38 +0200 topic: makes split keep the topic
Boris Feld <boris.feld@octobus.net> [Tue, 27 Jun 2017 15:21:38 +0200] rev 2667
topic: makes split keep the topic Refactor split to extract the preparation of the working directory in a separate function. This helps topic wrap this function to save topic before update and restore it after preparing the working directory just before the split.
(0) -1000 -300 -100 -48 +48 +100 +300 +1000 tip