##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: allow aborting if last-message.txt is missing...
rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.
Augie Fackler - - Load All Authors

File last commit:

r26731:0c42b6bb default
r31225:749b057b default
Show More
rules
36 lines | 1.4 KiB | text/plain | TextLexer
/ contrib / debian / rules
History | Source | Raw |Copy content |Copy permalink
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
 r26148 #!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
CPUS=$(shell cat /proc/cpuinfo | grep -E ^processor | wc -l)
%:
dh $@ --with python2
override_dh_auto_test:
http_proxy='' dh_auto_test -- TESTFLAGS="-j$(CPUS)"
override_dh_python2:
dh_python2
find debian/mercurial/usr/share -type d -empty -delete
override_dh_install:
python$(PYVERS) setup.py install --root $(CURDIR)/debian/mercurial --install-layout=deb
# remove arch-independent python stuff
find $(CURDIR)/debian/mercurial/usr/lib \
! -name '*.so' ! -type d -delete , \
-type d -empty -delete
python$(PYVERS) setup.py install --root $(CURDIR)/debian/mercurial-common --install-layout=deb
make install-doc PREFIX=$(CURDIR)/debian/mercurial-common/usr
# remove arch-dependent python stuff
find $(CURDIR)/debian/mercurial-common/usr/lib \
-name '*.so' ! -type d -delete , \
-type d -empty -delete
Augie Fackler
debian: install hg-ssh to /usr/bin just like downstream
 r26296 cp contrib/hg-ssh $(CURDIR)/debian/mercurial-common/usr/bin
Augie Fackler
debian: install hgk as part of mercurial-common (issue4829)...
 r26299 mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/mercurial
cp contrib/hgk $(CURDIR)/debian/mercurial-common/usr/share/mercurial
Augie Fackler
debian: install config files as part of mercurial-common...
 r26298 mkdir -p $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/
cp contrib/debian/*.rc $(CURDIR)/debian/mercurial-common/etc/mercurial/hgrc.d/
Augie Fackler
debian: include bash completions in mercurial-common
 r26300 mkdir -p $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions
Augie Fackler
debian: install bash completion as hg and not mercurial (issue4900)
 r26731 cp contrib/bash_completion $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions/hg
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
 r26148 rm $(CURDIR)/debian/mercurial-common/usr/bin/hg