Durham Goode <durham@fb.com> [Tue, 05 May 2015 13:32:01 -0700] rev 1321
inhibit: don't inhibit pinned commits during rebase
During a rebase we pin certain commits to always be visible. This caused the
inhibit extension to inhibit them when a transaction closed. Let's make inhibit
aware of such pins and not obsolete them.
Laurent Charignon <lcharignon@fb.com> [Mon, 04 May 2015 16:56:46 -0700] rev 1320
evolve: extract the logic to solve one change into a method
The goal is to later reuse this method to implement the --rev flag for
evolve that solves the troubles in a revset.
Laurent Charignon <lcharignon@fb.com> [Mon, 04 May 2015 16:56:05 -0700] rev 1319
evolve: add new variable and comment
Add comment and introduce a new variable to keep track of if the progress ui
is shown. Later on we will use this variable in the implementation of the --rev
option.
Laurent Charignon <lcharignon@fb.com> [Mon, 04 May 2015 16:09:05 -0700] rev 1318
evolve: move code to track progress and start node
This makes it easier to refactor the evolve function in this serie of patches.
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 14:00:07 -0700] rev 1317
evolve: renaming of a variable
tro was not a really descriptive name, replacing it with nexttrouble.
Laurent Charignon <lcharignon@fb.com> [Mon, 04 May 2015 16:01:45 -0700] rev 1316
evolve: refactoring of the code displaying error when no trouble found
Before this patch, we had many return statements in the evolve function
especially in the part in charge of displaying errors when no troubles
were found. We move this code in a separate function.
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 15:11:00 -0700] rev 1315
evolve: refactor code computing stats of obsolescence markers
Duplicated code removal by extracting a function.
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 14:55:04 -0700] rev 1314
evolve: refactoring of code related to pushing obs markers
This removes duplicated code for the pushobsmarkers logic
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 04 May 2015 10:56:06 -0700] rev 1313
merge with stable
bunch of cleanup on stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 04 May 2015 10:58:14 -0700] rev 1312
update readme
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 04 May 2015 10:47:02 -0700] rev 1311
evolve: update cmddebugrecordpruneparents to the new markers creation API
The parents information are now first class citizen.
(caught by laurent using pylint)
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 04 May 2015 10:46:06 -0700] rev 1310
evolve: drop useless return
This return statement is never reached. This a actually a good new because its
variable was undefined. We remove it.
(caught by laurent using pylint)
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 14:34:05 -0700] rev 1309
evolve: add missing import
(caught by pylint)
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 14:47:01 -0700] rev 1308
evolve: improve transaction related code to use the lock module
Refactored some of the places where we are using locking in evolve to use
the lock module and write less code.
This should also fix a couple of bug where tr could be None at release time.
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 14:40:36 -0700] rev 1307
evolve: remove unused variables
As suggested by pyflakes, remove 5 unused variables in the evolve module.
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 14:30:15 -0700] rev 1306
evolve: remove unused code in _evolveany
remove some code that was doing nothing useful in _evolveany.
Laurent Charignon <lcharignon@fb.com> [Thu, 30 Apr 2015 14:22:30 -0700] rev 1305
evove: remove unused imports
Three imports where unused in the evolve module.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 10:36:43 -0700] rev 1304
tests: ensure we keep capturing output
In 3.4, output capture with bundle2 is disabled by default on local push.
Laurent Charignon <lcharignon@fb.com> [Mon, 20 Apr 2015 13:39:18 -0700] rev 1303
inhibit: updating to a obsolete commit prints warning message
We move the inhibition marker in the same wlock than the update operation, this
clears the warning message. To make it work we display the warning message on
lock release in evolve.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 15:12:17 -0700] rev 1302
evolve: stop conditional wrapping of _checkinvalidmarkers
We support down to Mercurial 3.3, all such version have this function.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 15:11:52 -0700] rev 1301
evolve: stop conditional wrapping of _getbundleobsmarkerpart
We support down to Mercurial 3.3, all such version have this function.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 15:11:07 -0700] rev 1300
evolve: stop conditional wrapping of _pushdiscoveryobsmarkers
We support down to Mercurial 3.3, all such version have this function.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 14:49:02 -0700] rev 1299
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 14:48:41 -0700] rev 1298
test-inhibit: test bookmark -D without prune enabled
The --config option were dropped for lack of documentation.
Laurent Charignon <lcharignon@fb.com> [Wed, 29 Apr 2015 13:01:23 -0700] rev 1297
inhibit: fix devel warning
_inhibitmarkers was taking a transaction without the proper lock. Adding the
lock removes the warnings.
Laurent Charignon <lcharignon@fb.com> [Thu, 23 Apr 2015 17:45:46 -0700] rev 1296
evolve: add -i flag to amend command
The -i flag was missing because it is not a global flag of the commit command.
We can't make it a global flag yet as it is used in many places where it would
not be appropriate so we just add it for this occurrence.
Also, we only want to add it when commit supports it (otherwise it wouldn't
work with older versions of mercurial)
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 14:23:09 -0700] rev 1295
prune: prune fix transaction pattern
I forgot to amend.
Durham Goode <durham@fb.com> [Tue, 07 Apr 2015 14:26:03 -0700] rev 1294
prune: fix pruning w/ bookmarks and inhibit
Previously prune would create the obsolesence markers, then try to fix up the
bookmarks. With inhibit enabled, the act of closing a transaction for the
bookmark step caused it to unhide commits that were trying to be pruned.
The fix is to put the whole thing in a transaction.
Durham Goode <durham@fb.com> [Tue, 07 Apr 2015 14:08:18 -0700] rev 1293
inhibit: remove book -D dependency on cmdprune
Bookmark -D was relying on the prune command to be registered, which isn't the
case if we've disabled evolve commands. Instead, let's just hard code the
arguments.
The real fix would be to abstract away the 'I want to prune commits'
functionality in evolve to a reusable function, but this will do for now.
Durham Goode <durham@fb.com> [Mon, 06 Apr 2015 15:44:00 -0700] rev 1292
inhibit: wrap repo.commit to inhibit nodes
Rebase was failing if you rebased a commit, stripped it, then rebased it again.
This is because the node was still hidden and we needed repo.commit to uninhibit
it.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 11:42:06 -0700] rev 1291
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 10:36:43 -0700] rev 1290
tests: ensure we keep capturing output
In 3.4, output capture with bundle2 is disabled by default on local push.
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 29 Apr 2015 10:20:04 -0700] rev 1289
update readme
Mentions greg ward work in documentation.
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 21:13:13 -0400] rev 1288
docs: format concepts guide better, with literal blocks
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 21:05:54 -0400] rev 1287
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 09:03:08 -0400] rev 1286
docs: remove unused/obsolete figures
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 21:08:33 -0400] rev 1285
docs: remove obsolete documentation
evolve-collaboration.rst
replaced by sharing.rst
instability.rst
introduction to the concept for Mercurial developers -- no longer
needed since most are now convinced
obs-concept.rst
largely replaced by the user guide
obs-implementation.rst
more for Mercurial developers; the source code is probably more
accurate and up-to-date
qsync.rst
the extension this referred to no longer exists
This fixes several more sphinx warnings. I've left some other old docs
around, because they still have useful content that needs to be
adapted and updated.
Greg Ward <greg@gerg.ca> [Thu, 23 Apr 2015 08:35:38 -0400] rev 1284
docs: add a table of contents
This silences many sphinx warnings about documents not included in any
toctree. Still need to delete obsolete .rst files to silence the rest
of the warnings.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:18:30 +0200] rev 1283
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:15:38 +0200] rev 1282
Added tag 5.1.4 for changeset 891c3ce894fa
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:15:20 +0200] rev 1281
prepare release 5.1.4
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 23 Apr 2015 03:10:11 +0200] rev 1280
evolve: drop unused 'urllib' import
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 22 Apr 2015 14:30:23 +0200] rev 1279
debugobsrelsethashtree: get the command to work again
The command was untested and became broken when we introduced the new discovery
hashing.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 16:52:08 +0200] rev 1278
getbundleobsmarker: prevent crash from filtered content (issue4616)
The discovery may discover common markers on non-served nodes. This lead to
crash when building the obsmarker part.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 17:37:19 +0200] rev 1277
test-wireproto: add some obsmarker discovery usage.
The old code was never checking that the discovery were skipping common markers.
This is now done.
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 21 Apr 2015 17:37:59 +0200] rev 1276
test-wireprotocol: test with both bundle1 and bundle2
Bundle two is becoming the major way of exchanging things now. We duplicate the
test and ensure the default version runs using bundle2.
Julien Cristau <julien.cristau@logilab.fr> [Mon, 20 Apr 2015 14:45:50 +0200] rev 1275
Update debian packaging for 5.1.3
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 19 Nov 2014 01:04:44 +0000] rev 1274
Update debian packaging for 5.0.0
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 11 Apr 2015 10:15:16 -0400] rev 1273
create 3.1 compatibility branch
The next changeset drop 3.1 compatibility.
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Apr 2015 14:21:38 +0200] rev 1272
merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Apr 2015 14:20:03 +0200] rev 1271
Add "documentation update" to the changelog.
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:01:05 -0400] rev 1270
docs: cover 'touch' command
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:18:01 -0400] rev 1269
docs: explain that obsolete is not hidden
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:09:55 -0400] rev 1268
docs: explain --hidden option
Also move the discussion of revision numbers up, and splice the
explanation of --hidden into it.
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:42:42 -0400] rev 1267
docs: tweak wording, punctuation for better readability
Greg Ward <greg@gerg.ca> [Mon, 13 Apr 2015 15:00:05 -0400] rev 1266
docs: flesh out unfinished bits in the intro page
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:58:13 -0400] rev 1265
docs: revive the explanation of divergent changesets in the sharing guide
Greg Ward <greg@gerg.ca> [Fri, 20 Jun 2014 08:19:04 -0400] rev 1264
docs (sharing): more scattered wording tweaks
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:55:04 -0400] rev 1263
docs: sharing guide: clarify end-game of "Example 2"
- push to dev-repo, rather than pulling into it (consistent
with how we work the multiple developer scenario later)
- explicitly demonstrate that public changesets are immutable
Greg Ward <greg@gerg.ca> [Sun, 15 Jun 2014 21:17:09 -0400] rev 1262
docs: minor tweaks to sharing guide (suggested by timeless)
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:53:12 -0400] rev 1261
docs: add code review scenario to sharing guide
The idea is to demonstrate a simpler multiple-developer situation that
does not involve getting into trouble.
The final scenario illustrates Alice and Bob getting into trouble with
bumped and divergent changesets by amending each other's history. The
required tests and text are all written, but will need to be heavily
revised because of the inserted scenario.
Greg Ward <greg@gerg.ca> [Mon, 09 Jun 2014 08:18:43 -0400] rev 1260
docs: add a bit more hierarchy to the sharing guide
Greg Ward <greg@gerg.ca> [Tue, 14 Apr 2015 12:43:37 -0400] rev 1259
docs: update sharing guide based (mostly) on marmoute's review
- don't claim certain scenarios are more/less common, just
simple/advanced
- mention code review as a multiple-developer scenario (not described
in detail yet!)
- suggest "hg config --edit --local" instead of "cat >> .hg/hgrc"
- use -q less often (and show resulting output)
- edit some section headers to be consistent with user guide
(example numbers; "amend" instead of "amending")
(These are just the small changes; big changes are yet to come.)
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 20 Apr 2015 13:52:43 +0200] rev 1258
Added tag 5.1.3 for changeset c52c15100fb2