##// END OF EJS Templates
split: new extension to split changesets...
split: new extension to split changesets This diff introduces an experimental split extension to split changesets. The implementation is largely inspired by Laurent Charignon's implementation for mutable-history (changeset 9603aa1ecdfd54b0d86e262318a72e0a2ffeb6cc [1]) This version contains various improvements: - Rebase by default. This is more friendly for new users. Split won't lead to merge conflicts so a rebase won't give the user more trouble. This has been on by default at Facebook for months now and seems to be a good UX improvement. The rebase skips obsoleted or orphaned changesets, which can avoid issues like allowdivergence, merge conflicts, etc. This is more flexible because the user can decide what to do next (see the last test case in test-split.t) - Remove "Done split? [y/n]" prompt. That could be detected by checking `repo.status()` instead. - Works with obsstore disabled. Without obsstore, split uses strip to clean up old nodes, and it can even handle split a non-head changeset with "allowunstable" disabled, since it runs a rebase to solve the "unstable" issue in a same transaction. - More friendly editor text. Put what has been already split into the editor text so users won't lost track about where they are. [1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b Differential Revision: https://phab.mercurial-scm.org/D1082

File last commit:

r35191:bd8875b6 default
r35471:02ea370c @7 default
Show More
.hgignore
68 lines | 849 B | text/plain | TextLexer
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 syntax: glob
*.elc
Simon Heimberg
Makefile: do update on a temporary copy of a po file...
r19991 *.tmp
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 *.orig
*.rej
*~
Bryan O'Sullivan
Ignore mergebackup files generated by mpatch
r5019 *.mergebackup
Vadim Gelfer
contrib: add restricted shell.
r2341 *.o
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 *.so
Craig Leres
hgignore: ignore dll files generated under cygwin
r13643 *.dll
Adrian Buehlmann
hgignore: simply ignore all *.exe's everywhere...
r17115 *.exe
Adrian Buehlmann
ignore *.pyd files...
r6551 *.pyd
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 *.pyc
Simon Heimberg
hgignore: ignore more bytecode...
r13346 *.pyo
*$py.class
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 *.swp
*.prof
Adrian Buehlmann
hgignore: ignore zip files
r17274 *.zip
Bryan O'Sullivan
win32text: be more careful about rejecting violating changesets...
r8147 \#*\#
.\#*
Vadim Gelfer
let run-tests run optional code coverage tests....
r2068 tests/.coverage*
Bryan O'Sullivan
tests: write recent run times to a file named tests/.testtimes...
r27634 tests/.testtimes*
David R. MacIver
testing: generate tests operations using Hypothesis...
r28255 tests/.hypothesis
tests/hypothesis-generated
Thomas Arendsen Hein
Ignore annotated coverage output of run-tests.py -C
r2151 tests/annotated
Gregory Szorc
run-tests: mechanism to report exceptions during test execution...
r35191 tests/exceptions
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 tests/*.err
Markus Zapke-Gründemann
tests: add htmlcov option
r15859 tests/htmlcov
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 build
Yuya Nishihara
hgignore: ignore chg binary
r28061 contrib/chg/chg
Vadim Gelfer
contrib: add restricted shell.
r2341 contrib/hgsh/hgsh
anatoly techtonik
contrib/vagrant: use Vagrant for running tests on virtual machine...
r21874 contrib/vagrant/.vagrant
av6
make: templatize Debian build target a la e63dfbbdbd07
r33025 contrib/docker/debian-*
Sean Farley
make: turn ubuntu docker into template...
r29031 contrib/docker/ubuntu-*
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 dist
Matt Mackall
packaging: move output directory from build/ to packages/...
r21560 packages
Takumi IINO
doc: make man and html from translated documents...
r19426 doc/common.txt
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 doc/*.[0-9]
Takumi IINO
doc: make man and html from translated documents...
r19426 doc/*.[0-9].txt
Thomas Arendsen Hein
Ignore generated documentation
r1817 doc/*.[0-9].gendoc.txt
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 doc/*.[0-9].{x,ht}ml
MANIFEST
Thomas Arendsen Hein
hgignore: ignore MANIFEST.in (generated since 2ce7dfe17bc5)
r14560 MANIFEST.in
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 patches
timeless
setup: create a module for the modulepolicy...
r28430 mercurial/__modulepolicy__.py
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 mercurial/__version__.py
Adrian Buehlmann
exewrapper: adapt for legacy HackableMercurial...
r17732 mercurial/hgpythonlib.h
Lee Cantey
Ignore mercurial.egg-info build output
r11380 mercurial.egg-info
Lee Cantey
Ignore .DS_Store directories...
r2987 .DS_Store
Kirill Smelkov
.hgignore += tags & cscope files
r5693 tags
cscope.*
Angel Ezquerra
hgignore: ignore the PyCharm workspace folder
r22945 .idea/*
Philippe Pepiot
perf: add asv benchmarks...
r30406 .asv/*
Martin Geisler
i18n: let Makefile generate i18n/hg.pot...
r7648 i18n/hg.pot
Martin Geisler
i18n: new build_mo command for setup.py...
r7649 locale/*/LC_MESSAGES/hg.mo
Yuya Nishihara
setup: add command to generate index of extensions...
r14538 hgext/__index__.py
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270
Boris Feld
packaging: add make target for linux wheels...
r32080 # Generated wheels
wheelhouse/
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
r1270 syntax: regexp
Thomas Arendsen Hein
Ignore test error files, protect dot in .pc/
r794 ^\.pc/
Brendan Cully
Ignore eclipse droppings
r7439 ^\.(pydev)?project
Laurens Holst
ignore: add files present in the hackable-hg windows distribution
r15702
# hackable windows distribution additions
Mads Kiilerich
update .hgignore for hackable with Python 2.7
r16537 ^hg-python
Laurens Holst
ignore: add files present in the hackable-hg windows distribution
r15702 ^hg.py$