# HG changeset patch # User Matt Harbison # Date 2018-01-20 00:20:50 # Node ID f00edef84c3b36d7c6d5a3adedeef3aa8caab8fc # Parent 60a6ab7bcda7ed0e97c72912be4e029c38f0ef15 lfs: rename {lfsattrs} to {pointer} This seems more descriptive. diff --git a/hgext/lfs/__init__.py b/hgext/lfs/__init__.py --- a/hgext/lfs/__init__.py +++ b/hgext/lfs/__init__.py @@ -362,7 +362,7 @@ def lfsfiles(repo, ctx, **args): pointers = wrapper.pointersfromctx(ctx) # {path: pointer} files = sorted(pointers.keys()) - def lfsattrs(v): + def pointer(v): # In the file spec, version is first and the other keys are sorted. sortkeyfunc = lambda x: (x[0] != 'version', x) items = sorted(pointers[v].iteritems(), key=sortkeyfunc) @@ -371,7 +371,7 @@ def lfsfiles(repo, ctx, **args): makemap = lambda v: { 'file': v, 'oid': pointers[v].oid(), - 'lfsattrs': templatekw.hybriddict(lfsattrs(v)), + 'pointer': templatekw.hybriddict(pointer(v)), } # TODO: make the separator ', '? diff --git a/tests/test-lfs.t b/tests/test-lfs.t --- a/tests/test-lfs.t +++ b/tests/test-lfs.t @@ -865,16 +865,16 @@ there's no 'lfs' destination repo requir oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 size 29 x-is-binary 0 - $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{lfsattrs % '{key}={value}\n'}'}" + $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{pointer % '{key}={value}\n'}'}" version=https://git-lfs.github.com/spec/v1 oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 size=29 x-is-binary=0 $ hg --cwd convert_lfs log -r 0 \ - > -T '{lfs_files % "{get(lfsattrs, "oid")}\n"}{lfs_files % "{lfsattrs.oid}\n"}' + > -T '{lfs_files % "{get(pointer, "oid")}\n"}{lfs_files % "{pointer.oid}\n"}' sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 - $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{lfsattrs}\n"}' + $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{pointer}\n"}' version=https://git-lfs.github.com/spec/v1 oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 size=29 x-is-binary=0 $ hg --cwd convert_lfs \ > log -r 'all()' -T '{rev}: {lfs_files % "{file}: {oid}\n"}'