Skip to content
Snippets Groups Projects
  1. Nov 20, 2011
  2. Nov 18, 2011
  3. Nov 20, 2011
  4. Nov 11, 2011
  5. Nov 16, 2011
    • Thomas De Schampheleire's avatar
      hook: flush stdout before redirecting to stderr · 8b011ede
      Thomas De Schampheleire authored
      When hook output redirection is enabled (e.g. when cloning over ssh), hook
      output on stdout is redirected to stderr, to prevent the repository data on
      stdout from being corrupted.
      In certain cases, the redirection could cause part of the repository data to
      end up on stderr as well. In case of a clone, this causes:
      "abort: consistency error in delta!"
      
      This was seen with a clone over ssh, an outgoing hook present (any
      non-python type, e.g. 'pwd'), on certain repositories only,
      probably depending on the distribution of the sent data)
      
      This patch updates the hook redirection code to flush stdout before
      redirecting, removing the problem.
      8b011ede
    • Patrick Mezard's avatar
      import: fix parent selection when importing merges · 6cae68a3
      Patrick Mezard authored
      With "wp1" and "wp2" the current working directory parents, "p1" and "p2" the
      patch parents and "parents" the resulting commit parents, the current behaviour
      is:
      
      --bypass --exact p2 parents
      0        0       0  [wp1, wp2]
      0        0       1  [wp1, wp2]/buggy
      0        1       0  [p1]
      0        1       1  [p1, p2]
      1        0       0  [wp1, wp2]
      1        0       1  [p1, p2]
      1        1       0  [p1]
      1        1       1  [p1, p2]
      
      The original behaviour before f53dc0787424 was:
      
      --bypass --exact p2 parents
      0        0       0  [wp1, wp2]
      0        0       1  if p1 == wp1 then [p1, p2] otherwise [wp1, wp2]
      0        1       0  [p1]
      0        1       1  [p1, p2]
      
      This patch restores the previous behaviour when --bypass is not set, and align
      --bypass behaviour when --exact is not set with merge diffs.
      6cae68a3
  6. Nov 13, 2011
  7. Nov 12, 2011
  8. Nov 13, 2011
  9. Nov 16, 2011
  10. Nov 15, 2011
  11. Nov 11, 2011
  12. Nov 15, 2011
  13. Nov 10, 2011
    • Matt Mackall's avatar
      tests: fix trailing whitespace · f8a0c792
      Matt Mackall authored
      f8a0c792
    • Matt Mackall's avatar
    • Katsunori FUJIWARA's avatar
      largefiles: treat status of cache missed largefiles as "missing" correctly · 6a7e8743
      Katsunori FUJIWARA authored
      "hg status" may treat cache missed largefiles as "removed" incorrectly.
      
      assumptions for problem case:
      
        - there is no cache for largefile "L"
        - at first, update working directory to the revision in which "L" is
          not yet added,
        - then, update working directory to the revision in which "L" is
          already added
      
      and now, "hg status" treats "L" as "removed".
      
      current implementation does not allocate entry for cache missed
      largefile in ".hg/largefiles/dirstate", but files without
      ".hg/largefiles/dirstate" entry are treated as "removed" by largefiles
      extension.
      
      "hg revert" can not recover from this situation, but "rm -rf
      .hg/largefiles", because it causes dirstate rebuilding.
      
      this patch invokes normallookup() for cache missed largefiles to
      allocate entry in ".hg/largefiles/dirstate", so "hg status" can treat
      it as "missing" correctly.
      6a7e8743
    • Matt Mackall's avatar
      merge with i18n · 93273948
      Matt Mackall authored
      93273948
  14. Nov 08, 2011
  15. Nov 09, 2011
  16. Nov 06, 2011
  17. Nov 08, 2011
  18. Nov 10, 2011
    • Nicolas Venegas's avatar
      mdiff/patch: fix bad hunk handling for unified diffs with zero context · 2b1ec74c
      Nicolas Venegas authored
      Prior to this patch "hg diff -U0", i.e., zero lines of context, would
      output hunk headers with a start line one greater than what GNU patch
      and git output. Guido van Rossum documents the unified diff format[1]
      as having a start line value "one lower than one would expect" for
      zero length hunks.
      
      Comparing the behaviour of the three systems prior to this patch in
      transforming
      
        c1
        c3
      
      to
      
        c1
        c2
        c3
      
      - GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@"
      - "git diff -U0" reports the hunk as "@@ -1,0 +2 @@"
      - "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@"
      
      After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@".
      
      Since "hg export --config diff.unified=0" outputs zero-context unified
      diffs, "hg import" has also been updated to account for start lines
      one less than expected for zero length hunk ranges.
      
      [1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293
      2b1ec74c
  19. Nov 08, 2011
    • Patrick Mezard's avatar
      convert/bzr: correctly handle divergent nested renames (issue3089) · 6ba2fc0a
      Patrick Mezard authored
      With renames like:
      
        a   -> b
        a/c -> a/c
      
      We were ignoring or duplicating the second one instead of leaving files
      unchanged or moving them to their proper destination only.
      
      To avoid this, we process the files in reverse lexicographic order, from most
      to least specific change, and ignore files already processed.
      
      v2:
      - Add a test
      - Change "reverse=1" into "reverse=True"
      6ba2fc0a
  20. Nov 04, 2011
  21. Nov 03, 2011
  22. Nov 01, 2011
Loading