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

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

merge-tools: allow marking a mergetool as completely disabled...
merge-tools: allow marking a mergetool as completely disabled Very often in my life I'm finding that the only configured merge tool present on the system is vimdiff[0], and it's currently impossible (as far as I can tell) short of specifying `ui.merge = `[1] to actually *disable* a merge tool. This allows vimdiff-haters to put: [merge-tools] vimdiff.disable = yes in their ~/.hgrc and never see vimdiff again. I'm stopping short of putting this as a commented out entry in the sample new user hgrc (seen when a user runs `hg config --edit` with no ~/.hgrc) for now, but I might come back and do that later. 0: vimdiff is at an awkward intersection: it's usually installed by the vim package which is often installed as a vi substitute, so it's mere presence doesn't imply me wanting it, unlike (say) kdiff3. 1: There's a related problem I ran into today where specifying `ui.merge = :merge` failed because :merge isn't a command, which I think is a regression. I'll try and figure that out and at least file a bug.
Augie Fackler - - Load All Authors

File last commit:

r26300:f946c126 default
r26730:a1e43e85 default
Show More
rules
36 lines | 1.5 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
cp contrib/bash_completion $(CURDIR)/debian/mercurial-common/usr/share/bash-completion/completions/mercurial
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
 r26148 rm $(CURDIR)/debian/mercurial-common/usr/bin/hg