subrepo/svn: fix checked out rev number retrieval (issue2968) The initial version was to take the "Revision" field from svn info. It works but produces false positive when parent paths are being moved or unrelated changes are being committed, causing it to change while the svn checkout itself remains the same. To avoid spurious commit, we took "Revision" and "Last Changed Rev" for general comparison and kept the latter to answer "what is your revision?" question. This is better but fails when the subrepo path exists at "Revision" but not at "Last Changed Rev". This patch adds a check for this, and returns "Revision" if the path does not exist. We try to avoid doing this as much as possible at it implies an extra, *remote* call.

     1

#!/usr/bin/env python

     2

     3

__doc__ = """Same as `echo a >> b`, but ensures a changed mtime of b.

     4

Without this svn will not detect workspace changes."""

     5

     6

import sys, os

     7

     8

text = sys.argv[1]

     9

fname = sys.argv[2]

    10

    11

f = open(fname, "ab")

    12

try:

    13

    before = os.fstat(f.fileno()).st_mtime

    14

    f.write(text)

    15

    f.write("\n")

    16

finally:

    17

    f.close()

    18

inc = 1

    19

now = os.stat(fname).st_mtime

    20

while now == before:

    21

    t = now + inc

    22

    inc += 1

    23

    os.utime(fname, (t, t))

    24

    now = os.stat(fname).st_mtime

    25