facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity
8,001 Commits 24 Branches 62 Tags 322 MiB
ea1734b579
Commit Graph

8001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Augie Fackler
bf90b0cbb4 merge: better error messages to lead users to hg update --clean to abandon merges. 
Fixes issue1533.
 2009-03-04 13:06:16 -06:00
Matt Mackall
5871cdf2c8 audit: be even pickier (issue1450) 2009-03-04 17:02:16 -06:00
John Coomes
664dabc0ed tests: strip o/s-dependent error messages from some http tests 2009-02-27 17:28:26 -08:00
Benoit Boissinot
6469b223b7 bisect: use integer division 2009-03-28 17:29:14 +01:00
Bill Barry
8ac447bbd7 dispatch: extract command execution block into method 
This pulls the pre-command hook/command/post-command hook workflow out of
the method it is in and puts it into its own method so that it potentially
could be exposed for extensions to wrap.
 2009-02-12 09:36:15 -07:00
Benoit Allard
8cea013db9 bookmarks: change NAME to REV 2009-02-05 23:47:31 +01:00
Alex Unden
eb753f04dc bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set 2009-02-27 02:01:45 -08:00
David Soria Parra
f6ec2e9b01 bookmarks: Set current bookmark if we create a new one on the tip 
If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.
 2009-03-01 00:30:01 +01:00
Matt Mackall
6ed04dc163 convert: change hg.saverev default to False 
This needlessly breaks changeset identifiers for the common case (cleaning
history), which is sad.
 2009-03-02 19:19:12 -06:00
Matt Mackall
104cda5c20 tag: force load of tag cache 2009-03-02 19:19:09 -06:00
Mads Kiilerich
2694fdc1a4 run-tests.py: avoid using popen2.Popen4 - use subprocess instead 
Use subprocess to emulate Popen4 if available - similar to how it is done in
util.py.

Using popen2 under python 2.6 gives
DeprecationWarning: The popen2 module is deprecated.  Use the subprocess module.
 2009-02-27 19:10:38 +01:00
Mads Kiilerich
9686279212 test-convert-cvs*: mute output from "cvs up" 
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
 2009-02-27 17:52:31 +01:00
Stefano Tortarolo
b64c9c29db i18n: update italian translation 2009-02-28 13:15:58 +01:00
Dirkjan Ochtman
fee33f3cb4 merge with crew-stable 2009-03-02 23:11:15 +01:00
Stefan Rusek
50d1fd501f include i18n files in the win32 installer 
The .mo files for translations should be included in the Windows installer.
 2009-03-02 23:07:56 +01:00
Dirkjan Ochtman
f7eaf63265 help: get rid of double spaces 2009-02-28 12:33:24 +01:00
timeless
26d95caa99 help: miscellaneous language fixes 2009-02-28 12:38:45 +01:00
Dirkjan Ochtman
fbf5ef05d7 help: better explanations for some of the template filters 
In particular, provide some example data for some of the common filters.
Thanks go to timeless again for pointing out where we were lacking.
 2009-02-28 12:25:14 +01:00
Dirkjan Ochtman
5b24c2c694 help: better explanation for some of the environment variables 
In particular, the precedence for usernames is explained in more detail.
Thanks to timeless for pointing out the deficiencies here.
 2009-02-28 12:23:23 +01:00
timeless
ebb328e76d help: some language fixes for help topics 2009-02-28 12:21:41 +01:00
Matt Mackall
b557385c57 Merge with stable 2009-02-27 08:13:42 -06:00
Martin Geisler
6c5bf586cb setup: run hg with empty HGRCPATH for robustness. 
Otherwise a bad hgrc file can make the version detection fail.
 2009-02-24 18:09:16 +01:00
Dirkjan Ochtman
7be8113e09 contrib: add hgwebdir.wsgi, to serve as a better example 2009-02-24 16:05:43 +01:00
Dirkjan Ochtman
680b0c1d1e contrib: bring hgwebdir.fcgi up-to-date with current WSGI practices 2009-02-24 16:01:29 +01:00
Steve Borho
6e4ca6d775 catch CTRL-D at password prompt 
We caught this exception in ui.prompt(), but not here.  Without
this, hitting CTRL-D at the password prompt gives a long traceback.
 2009-02-21 17:46:06 -06:00
Pascal Quantin
29992cd051 Update Beyond Compare's configuration 
If there is already a Beyond Compare's instance running when performing a merge
from Mercurial, BCompare.exe will exit immediately and the merge will fail.
Use the /solo switch to make it always wait (it will open each comparison in
it's own window instead of in tabs)
 2009-02-04 22:12:55 +01:00
Benoit Boissinot
4f86fc98f8 merge with crew 2009-02-22 23:03:42 +01:00
Martin Geisler
4ffc271156 i18n: updates to the Danish translation 2009-02-22 22:06:47 +01:00
David Soria Parra
05d917cd57 bookmarks: add force option to command syntax description 2009-02-22 19:23:09 +01:00
FUJIWARA Katsunori
1013309839 i18n: update Japanese translation 
this finished translation for:

  - online help for all core commands
  - all other help topics, except of "templating"
 2009-02-20 23:48:09 +09:00
Frank Wierzbicki
975c4301af tests: use same popen strategy for jython as for nt 2009-02-18 13:19:30 +01:00
Brodie Rao
0f571034a3 Makefile: remove locale folder during clean 2009-02-17 18:47:28 -05:00
Martin Geisler
a4fae9e3f1 setup: use sys.executable to call hg 
Executing ".\hg" does not work on Windows, but we can instead ask
Python to execute hg.
 2009-02-18 00:44:38 +01:00
Martin Geisler
367da73b3e bookmarks: escape literal backslashes in docstring 2009-02-17 23:58:56 +01:00
Dongsheng Song
d4267f9baa i18n: updated Chinese translation 2009-02-17 23:13:48 +08:00
Matt Mackall
cb4d50ff04 Introduce HG_PREPEND to solve pretxn races 
- add writepending to flush delayed writes to separate file
- add support in hooks for lazy evaluation of callable parameters
- add HG_PENDING to pretxn hooks
  - call writepending if hook is used
  - pass repo root to hook environment
- if HG_PENDING = repo root, we're in pretxn hook
  - read pending data to make pending changesets visible
- filter HG_PENDING in tests/printenv.py
 2009-02-16 19:35:07 -06:00
Dirkjan Ochtman
d6a90e5a13 merge with stable 2009-01-25 19:15:49 +01:00
Patrick Mezard
56a4e737a8 Fix a corner case when committing a rename after a merge (issue1476) 2009-01-25 18:55:29 +01:00
Matt Mackall
a8a2c25a67 wire protocol: avoid infinite loop (issue1483) 2009-01-25 10:16:45 -06:00
Matt Mackall
3ff835714e verify: don't trip over binary files starting with 01 0a 2009-01-21 11:15:47 -06:00
Stefano Tortarolo
ae208b3a98 rebase: pull --rebase updates if there is nothing to rebase 2009-01-18 19:59:51 +01:00
Mads Kiilerich
d6ab2f95b5 test-merge-tool: Make sure no hgmerge can be found in $PATH 
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
 2009-02-10 22:47:38 +01:00
Matt Mackall
7c27807553 audit: check for casefolding of .hg (issue1450) 2009-02-16 17:37:23 -06:00
Matt Mackall
2e1730294c patch: teach selectfile about symlinks (issue1438) 2009-02-16 17:37:23 -06:00
Matt Mackall
1a2d87e4e1 mq: handle empty patches more gracefully (issue1501) 2009-02-16 17:37:23 -06:00
Matt Mackall
b649059d2b keepalive: borrow code from newer httplib to patch ValueError (issue1088) 2009-02-16 17:37:23 -06:00
Matt Mackall
f547c37df5 rename: simplify forced renaming 
This should help work around virus scanner issues with rename on Windows.
 2009-02-16 17:37:23 -06:00
Matt Mackall
ca1b896eac log: ignore --removed if no files specified (issue1166) 
Otherwise we filter out merge changesets with no changed files
 2009-02-16 17:37:23 -06:00
Matt Mackall
9b12427bc1 Don't fail on clone on win98 (issue1492) 2009-02-16 17:37:23 -06:00
Alexander Solovyov
505e1dc92b zeroconf: don't allow ipv6 addresses 2009-02-15 20:18:29 +02:00