Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commit.py @ 45256:d056a131c93f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commitctx: document the None return for "touched" value
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 22 Jul 2020 16:10:33 +0200
parents ce9ee81df9ff
children 5d0998ccedbb
comparison
equal deleted inserted replaced
45255:f512708a9ea8 45256:d056a131c93f
236 changeset extra as copy source of truth). 236 changeset extra as copy source of truth).
237 237
238 output: (filenode, touched) 238 output: (filenode, touched)
239 239
240 filenode: the filenode that should be used by this changeset 240 filenode: the filenode that should be used by this changeset
241 touched: one of: None, 'added' or 'modified' 241 touched: one of: None (mean untouched), 'added' or 'modified'
242 """ 242 """
243 243
244 fname = fctx.path() 244 fname = fctx.path()
245 fparent1 = manifest1.get(fname, nullid) 245 fparent1 = manifest1.get(fname, nullid)
246 fparent2 = manifest2.get(fname, nullid) 246 fparent2 = manifest2.get(fname, nullid)