Skip to content
Snippets Groups Projects
  1. Dec 07, 2017
    • Matt Harbison's avatar
      lfs: introduce a user level cache for lfs files · 8e72f9152c4d
      Matt Harbison authored
      This is the same mechanism in place for largefiles, and solves several problems
      working with multiple local repositories.  The existing largefiles method is
      reused in place, because I suspect that there are other functions that can be
      shared.  If we wait a bit to identify more before `hg cp lfutil.py ...`, the
      history will be easier to trace.
      
      The push between repo14 and repo15 in test-lfs.t arguably shouldn't be uploading
      any files with a local push.  Maybe we can revisit that when `hg push` without
      'lfs.url' can upload files to the push destination.  Then it would be consistent
      for blobs in a local push to be linked to the local destination's cache.
      
      The cache property is added to run-tests.py, the same as the largefiles
      property, so that test generated files don't pollute the real location.  Having
      files available locally broke a couple existing lfs-test-server tests, so the
      cache is cleared in a few places to force file download.
      8e72f9152c4d
  2. Dec 06, 2017
  3. Nov 17, 2017
  4. Oct 25, 2017
    • Matthieu Laneuville's avatar
      patch: add within-line color diff capacity · 6ba79cf34f5e
      Matthieu Laneuville authored
      The `diff' command usually writes deletion in red and insertions in green. This
      patch adds within-line colors, to highlight which part of the lines differ.
      Lines to compare are decided based on their similarity ratio, as computed by
      difflib SequenceMatcher, with an arbitrary threshold (0.7) to decide at which
      point two lines are considered entirely different (therefore no inline-diff
      required).
      
      The current implementation is kept behind an experimental flag in order to test
      the effect on performance. In order to activate it, set inline-color-diff to
      true in [experimental].
      6ba79cf34f5e
  5. Sep 22, 2016
  6. Oct 22, 2017
  7. Sep 22, 2016
    • Yuya Nishihara's avatar
      dagop: copy basefilectx.ancestors() to free function · 0d27685b4a2f
      Yuya Nishihara authored
      The primary goal of this series is to make follow() support multiple start
      revisions.
      
      dagop.filectxancestors() will be extended to take multiple filectxs.
      basefilectx.ancestors() is not forwarded to this function because doing that
      would resurrect the performance issue fixed by 24b57c3899f8.
      0d27685b4a2f
    • Yuya Nishihara's avatar
      test-log: test that fctx.ancestors() can't index parents only by linkrev · 2af38229f147
      Yuya Nishihara authored
      This covers a possible bug that could be caused by the following change:
      
        --- a/mercurial/context.py
        +++ b/mercurial/context.py
        @@ -1047,7 +1047,7 @@ class basefilectx(object):
      
                 while True:
                     for parent in c.parents()[:cut]:
        -                visit[(parent.linkrev(), parent.filenode())] = parent
        +                visit[parent.linkrev()] = parent
                     if not visit:
                         break
                     c = visit.pop(max(visit))
      2af38229f147
  8. Oct 17, 2017
    • Boris Feld's avatar
      pull: retrieve bookmarks through the binary part when possible · 44b8b5ad30eb
      Boris Feld authored
      This makes pull consistent with the part used by push and provide us with a
      more compact representation of bookmarks.
      
      In addition, this opens the way for smarter bookmark exchanges (e.g. filtering
      by names or only sending the bookmark relevant to the pulled set, etc).
      44b8b5ad30eb
    • Boris Feld's avatar
      getbundle: add support for 'bookmarks' boolean argument · cb4dcd7fabe7
      Boris Feld authored
      This new argument requests a 'bookmarks' part from the server. It is meant to
      be used instead of the "listkeys" request.
      cb4dcd7fabe7
    • Boris Feld's avatar
      bundle2: support a 'records' mode for the 'bookmarks' part · 496154e41968
      Boris Feld authored
      In this mode, the bookmarks changes are record in the 'bundleoperation' records
      instead of inflicted to the repository. This is necessary to use the part when
      pulling.
      496154e41968
    • Boris Feld's avatar
      bundle2: add a 'modes' dictionary to the bundle operation · 1f30cbac34b6
      Boris Feld authored
      This new attribute allows the codes requesting an unbundling to pass important
      information to individual part handlers. The current target use case is to
      allow for receiving 'bookmarks' part without directly updating local
      repository, but just recording the received data instead. This is necessary
      for pull where the remote bookmarks are processed locally. I expect the
      concept to be beneficial to other parts in the future.
      
      To clarify the bookmark behavior on pull, the remote bookmark value are not just
      taken -as-is- into the local repository. There is an extra step to detect
      bookmark divergence. The remote bookmarks data are stored until this processing
      happens.
      1f30cbac34b6
    • Boris Feld's avatar
      bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165) · a1e70c1dbec0
      Boris Feld authored
      We use the new binary parts we introduced earlier to exchange bookmark. The
      payload is a bit more compact since we use binary and the length of bookmarks
      is no longer constrained to 255.
      
      .. fix:: Issue 5165
      
         Bookmark, whose name is longer than 255, can again be exchanged again
         between 4.4+ client and servers.
      a1e70c1dbec0
    • Boris Feld's avatar
      bookmark: introduce in advance a variant of the exchange test · ae79d878702b
      Boris Feld authored
      We are about to introduce a new way to push bookmark to server. We introduce
      the test variant before actually updating the exchange to help the output
      changes to stand out when it happens.
      ae79d878702b
  9. Oct 15, 2017
  10. Oct 17, 2017
    • Boris Feld's avatar
      bookmark: add pushkey hook compatiblity to the bundle2 part · f392066d127c
      Boris Feld authored
      Currently, pushing a bookmark update triggers a pushkey hooks. It is likely
      that users in the wild use such hooks to control bookmark movement. Using a non
      push-key mechanism to exchange bookmark means these hooks are no longer called,
      possibly breaking existing users setup. So we add explicit call to the pushkey
      hooks in the handling of the bundle2 part. This behavior can be disabled with a
      new config knob: 'server.bookmarks-pushkey-compat'.
      f392066d127c
  11. Oct 15, 2017
    • Boris Feld's avatar
      bookmark: introduce a 'bookmarks' part · af5507203d01
      Boris Feld authored
      This part can carry and apply bookmarks information. We start with adding the
      core behavior of the part. In its current form, the part is only suitable for
      push since it plain update the bookmark without consideration for the local
      state. Support of the behavior needed for pulling will be added in later
      changesets.
      af5507203d01
  12. Nov 13, 2017
    • Boris Feld's avatar
      push: include a 'check:bookmarks' part when possible · ad5f2b923b0d
      Boris Feld authored
      Before updating the actual bookmark update, we can start with updating the way
      we check for push race. Checking bookmarks state earlier is useful even if we
      still use pushkey. Aborting before the changegroup is added can save a lot of
      time.
      ad5f2b923b0d
  13. Oct 15, 2017
    • Boris Feld's avatar
      bookmark: add a 'check:bookmarks' bundle2 part · dbf868623daf
      Boris Feld authored
      This part checks that bookmarks are still at the node they are expected to be.
      This allows a pushing client to detect push race where the repository was
      updated between the time it discovered the server state and the time it managed
      to finish its push.
      
      Such checking already exists when pushing bookmark through pushkey. This new
      part can be inserted at the beginning of the bundle, triggering abort earlier.
      In addition, we would like to move away from pushey to push bookmark. A step
      useful to solve issue5165.
      dbf868623daf
    • Boris Feld's avatar
      bookmark: add methods to binary encode and decode bookmark values · 3340d46a5c3f
      Boris Feld authored
      Coming new bundle2 parts related to bookmark will use a binary encoding. It
      encodes a series of '(bookmark, node)' pairs. Bookmark name has a high enough
      size limit to not be affected by issue5165. (64K length, we are well covered)
      3340d46a5c3f
  14. Dec 06, 2017
  15. Dec 05, 2017
  16. Dec 06, 2017
  17. Dec 05, 2017
  18. Nov 30, 2017
  19. Nov 28, 2017
  20. Nov 23, 2017
  21. Dec 05, 2017
Loading