equal
deleted
inserted
replaced
34 scmutil, |
34 scmutil, |
35 subrepoutil, |
35 subrepoutil, |
36 util, |
36 util, |
37 vfs as vfsmod, |
37 vfs as vfsmod, |
38 ) |
38 ) |
|
39 from .utils import dateutil |
39 |
40 |
40 hg = None |
41 hg = None |
41 reporelpath = subrepoutil.reporelpath |
42 reporelpath = subrepoutil.reporelpath |
42 subrelpath = subrepoutil.subrelpath |
43 subrelpath = subrepoutil.subrelpath |
43 _abssource = subrepoutil._abssource |
44 _abssource = subrepoutil._abssource |
1465 if user: |
1466 if user: |
1466 cmd += ['--author', user] |
1467 cmd += ['--author', user] |
1467 if date: |
1468 if date: |
1468 # git's date parser silently ignores when seconds < 1e9 |
1469 # git's date parser silently ignores when seconds < 1e9 |
1469 # convert to ISO8601 |
1470 # convert to ISO8601 |
1470 env['GIT_AUTHOR_DATE'] = util.datestr(date, |
1471 env['GIT_AUTHOR_DATE'] = dateutil.datestr(date, |
1471 '%Y-%m-%dT%H:%M:%S %1%2') |
1472 '%Y-%m-%dT%H:%M:%S %1%2') |
1472 self._gitcommand(cmd, env=env) |
1473 self._gitcommand(cmd, env=env) |
1473 # make sure commit works otherwise HEAD might not exist under certain |
1474 # make sure commit works otherwise HEAD might not exist under certain |
1474 # circumstances |
1475 # circumstances |
1475 return self._gitstate() |
1476 return self._gitstate() |