repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Create the origin based import branch using git update-ref instead of git branch
2007-05-17
Simo
n
H
a
us
m
ann
Creat
e
the origin based import b
r
an
c
h using git update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Removed ancient
and un
u
sed code to find the las
t
imported
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hau
s
mann
Re
m
oved cl
e
antags c
o
mmand
.
It do
e
sn't have any meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Haus
m
ann
Cl
e
a
n up co
d
e du
p
licati
o
n for revision
p
arsing and
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
smann
Always pass a s
h
a1 for the i
n
iti
a
l parent so
that
git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Si
m
on H
a
u
smann
Fixing
s
yncing (
g
it
d
ir
discovery /
c
d
)
for
b
are re
p
ositor
i
es
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hau
s
mann
A
l
ittl
e
todo note be
f
ore
I
f
o
rget it :)
,
based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n Hausma
n
n
Fix cal
l
ing gi
t
-p4 rebase from withi
n
a
subdirectory
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simo
n
H
a
usm
a
nn
Give
a
bette
r
h
int if git-p4 submit fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausman
n
A
dded
th
e
pos
s
ibility of
s
kipping pat
c
hes dur
i
ng git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Sim
o
n Hausm
a
nn
Make git-p4 work with
b
are repositor
i
es
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Fix gi
t
-p4 clo
n
e /
/
depot/p
r
ojec
t
(
h
ead impor
t
)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Marius Sto
r
m
-Olsen
Mak
e
the command ca
l
l silent
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Co
n
verted to unix ne
w
line
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon H
a
usmann
Make su
b
m
itting work on Window
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
M
a
ke sure all popen call
s
use binary mode (for
W
indows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added a littl
e
.
bat wrapper from Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
imon Hau
s
man
n
Use the su
b
proc
e
s
s
m
o
dule ins
t
ead of popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
Simon Hausm
a
nn
Document some imp
l
ementation details, for th
e
c
u
rious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
Hausmann
Cleanup,
r
e
m
o
v
ed the
o
ld ta
g
gi
n
g code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausman
n
cleanup, renamed self
.
g
l
o
balPrefix to
s
elf
.
depo
t
P
a
th
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Si
m
on Hausmann
M
icro cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
Hausmann
Doc cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Sim
o
n Hausmann
Handle p
a
tch errors
i
n
git-p4 submit bet
t
e
r
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Haus
m
ann
A
new attempt at f
i
xing the
ch
i
ld-fast-import-
p
rocess
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hau
s
mann
Slightly imp
r
oved forma
t
t
i
ng of the r
a
w
_
i
nput
q
uestions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hau
s
mann
Re
m
o
v
ed the
old patch apply cod
e
f
r
om git-p4 s
u
bmit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simo
n
Hausmann
Fix the timezone formatting
.
No
w
qgit also d
i
s
p
l
a
ys
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
Sim
o
n Haus
m
ann
P
rint an error
m
e
ssag
e
of
s
ome sort if git fast-imp
o
rt
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
S
i
mo
n
Hausma
n
n
Al
l
o
w for c
o
n
v
en
i
e
n
t rebasing after
g
i
t-p4 submit
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
i
mon Hausma
n
n
Added a simp
l
e example of
u
sage to the "doc
u
mentation" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
im
o
n Hau
s
mann
fix
variable usage (
o
ops)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Fix file determination for #head imp
o
rts
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausm
a
nn
Added git
-
p
4 clone conve
n
i
e
n
c
e
command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Haus
m
a
n
n
Honor --silent
f
o
r
label
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on Hausmann
Turn
off potentia
l
ly slo
w
l
a
be
l
d
etectio
n
by defa
u
lt
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Provi
d
e a tr
e
e summary after git-
p
4 reba
s
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Si
m
on Hausmann
Added git-p4 rebase conven
i
enc
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
on
H
ausmann
Cl
e
an
up p
y
thon clas
s
names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
S
i
mon Ha
u
smann
Fi
x
"
c
om
p
ilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon Haus
m
ann
Fix
the docs f
o
r
git-p
4
s
ubm
i
t an
d
turn g
i
t-p4 submi
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
Simon Hau
s
man
n
F
i
x v
a
r
iable usage in t
a
g i
m
port
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Si
m
on Hausmann
A
dded support for
m
app
i
n
g p4 labels t
o
g
i
t tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hausm
a
nn
g
i
t
-
p
4
debug
doesn
'
t need a git rep
o
sit
o
ry
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausma
n
n
Don't t
r
y to parse any options with git
-
p
4
d
e
bug
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
ausmann
Prefer git command over git-
c
ommand
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
imon Hausmann
Minor co
s
metic fi
x
let
for the git-p4 submit sync question
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hau
s
mann
Different v
e
rsions
o
f
p
4 h
a
ve different output for
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
U
se the new incremental import s
t
yle b
y
default
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon
H
aus
m
ann
Make it pos
s
i
b
le t
o
run git-
p
4 submit from w
i
thin the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
Brand new smart
i
ncremental
import th
a
t
d
oe
s
n't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Set
the default branch i
n
run, not in t
h
e c
o
n
s
t
ructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausma
n
n
Helper funct
i
on to check
the exista
n
c
e
of a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon H
a
usmann
Adde
d
some help
e
r f
u
n
ct
i
on(s) to parse the dep
o
t path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausm
a
nn
Changed the defau
l
t bra
n
ch for
i
mports from "ma
s
t
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Sim
o
n Hausmann
Changed the format of th
e
imported
log
m
es
s
age sli
g
htly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Haus
m
ann
R
emoved the
.
py
exten
s
ion f
r
om
git-
p
4 as it's an
n
o
y
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Do
n
't show the s
u
bmit te
m
plate and the d
i
ff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hau
s
mann
M
ake it possible t
o
invoke git-p4
f
r
o
m within subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
Hausma
n
n
M
a
de --apply-as-patch the default for gi
t
-p
4
submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
Fix support fo
r
deletions i
n
g
i
t-p4 submit when
us
i
ng
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
Added experimental but super-
f
ast --app
l
y
-as-pa
t
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Ha
u
smann
D
o
c
umen
t
a
t
ion enh
a
n
c
e
m
en
t
s
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
o
n
Hausmann
S
t
a
rt of the
g
it-p4 d
o
c
um
e
ntation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Rem
o
ved
p
4
-fast-e
x
port and p4-git-sync as they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausman
n
F
i
xed the initial
v
ersion import
b
y gettin
g
the
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
im
o
n Hausmann
Ad
d
e
d mis
s
i
ng "self"s to
make t
h
e
script eva
l
ua
t
e corre
c
t
ly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simo
n
H
a
usman
n
Completely untested "me
r
ge"
of
p
4-fast
-
export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
syn
c
-to-perforce
i
s now ca
l
led su
b
mit
and fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
mann
Par
t
of the code is
c
opyright
by Trolltec
h
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
First (untested)
a
ttempt at mig
r
ating p4-g
i
t-sync into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
Pro
v
id
e
a little b
i
t of help description for t
h
e git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
im
o
n Hausmann
Start movi
n
g the git-p4 tools into one sing
l
e script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausma
n
n
Pass the right number of arguments to
c
o
mmit, fi
x
es
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon H
a
usmann
Imp
r
oved the
git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
S
i
m
on Hausmann
De
f
ault to in
t
eractive synci
n
g
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
S
i
mo
n
Haus
m
an
n
Use p4 revert
.
.
.
i
nstead
o
f
r
evert -a
.
.
.
af
t
er submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausman
n
Auto-det
e
c
t
th
e
current git
branch before s
u
bmitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon
Ha
u
smann
Ign
o
r
e
Apple r
e
source files when impor
t
i
ng from perforce
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
imon Hausmann
Be nice
a
nd use
/
usr/bi
n
/env pyth
o
n for the git-p
4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Automatic
a
lly
o
per
a
te on a temporary b
r
anch, n
e
e
ded
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon Hausmann
Lots of bugfixes to p
4
-git
-
sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Simon H
a
usmann
F
i
x
g
i
t-
d
ir option an
d
allow readi
n
g log subst
i
tutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
S
i
mon Hausman
n
First version
o
f a new sc
r
ipt to
submit changes
b
ack
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Haus
m
a
nn
Spl
i
t
up
the cache commandlin
e
options into
(co
m
ma
n
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Reduce the num
b
er of
f
a
lse "merges" by skipping "bran
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
i
mon Hau
s
ma
n
n
M
ore wo
r
k on branch
d
etection by impleme
n
ting
c
h
a
ngeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More c
o
de cleanups and prepar
a
tions for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Si
m
o
n
H
a
u
s
ma
n
n
Mi
n
or
cod
e
cleanups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Make the
p
4 da
t
a/comman
d
cache con
f
i
gurab
l
e
t
hrough
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
S
imon
H
ausmann
Fixe
d
p4-debug file e
x
tension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Si
m
on Hausmann
Changed
--known-branche
s
to take a file a
s
argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Work in progress on detecting
branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausmann
Adjust the output p
a
rsing
o
f gi
t
name-r
e
v t
o
handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don't pri
n
t
a
pl
a
in ne
w
l
i
ne at
t
he
e
n
d
o
f
the exec
u
tion
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon H
a
usmann
M
ore work
in --silent suppor
t
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Added s
u
pp
o
rt for --s
i
lent so that p4-fast-exp
o
rt can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Sim
o
n Ha
u
s
mann
Added p4 delete b
e
havioural
e
m
ula
t
ion as t
o
do it
e
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simo
n
Hausmann
Fix
s
i
ngle-branch
impor
t
s
b
y
s
kipping the b
r
anch/merge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausma
n
n
U
se
s
ets
.
Set() instead of set() to run also w
i
th older
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next