lfs: rename {pointer} to {lfspointer} stable
authorMatt Harbison <matt_harbison@yahoo.com>
Mon, 22 Jan 2018 17:47:40 -0500
branchstable
changeset 35797 76cb752af07a
parent 35796 de23345e2b6b
child 35798 97bdbcb43ebf
lfs: rename {pointer} to {lfspointer} Per Martin von Zweigbergk's suggestion to keep this unambiguous, for when it is migrated to {files} and friends.
hgext/lfs/__init__.py
tests/test-lfs.t
--- a/hgext/lfs/__init__.py	Mon Jan 22 18:08:50 2018 -0500
+++ b/hgext/lfs/__init__.py	Mon Jan 22 17:47:40 2018 -0500
@@ -371,7 +371,7 @@
     makemap = lambda v: {
         'file': v,
         'oid': pointers[v].oid(),
-        'pointer': templatekw.hybriddict(pointer(v)),
+        'lfspointer': templatekw.hybriddict(pointer(v)),
     }
 
     # TODO: make the separator ', '?
--- a/tests/test-lfs.t	Mon Jan 22 18:08:50 2018 -0500
+++ b/tests/test-lfs.t	Mon Jan 22 17:47:40 2018 -0500
@@ -865,16 +865,16 @@
   oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   size 29
   x-is-binary 0
-  $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{pointer % '{key}={value}\n'}'}"
+  $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{lfspointer % '{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(pointer, "oid")}\n"}{lfs_files % "{pointer.oid}\n"}'
+  >    -T '{lfs_files % "{get(lfspointer, "oid")}\n"}{lfs_files % "{lfspointer.oid}\n"}'
   sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
   sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
-  $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{pointer}\n"}'
+  $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{lfspointer}\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"}'